From 35f324b3e64a55b11b5cd6822ce9ae1c02ba4ad4 Mon Sep 17 00:00:00 2001 From: Ash Wu Date: Tue, 4 Aug 2020 17:45:07 +0800 Subject: [PATCH] Add missing env variables to start_ssh.py We need to pass these variables to `update_authorized_keys.py` 1. `SSH_TARGET_PUBLICKEY_API_PORT` to override the API port 2. Kubernetes info so the `config.load_incluster_config()` can work Signed-off-by: Ash Wu Signed-off-by: Timothy Lee --- docker-res/start_ssh.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-res/start_ssh.py b/docker-res/start_ssh.py index 244ef18..88c77ee 100644 --- a/docker-res/start_ssh.py +++ b/docker-res/start_ssh.py @@ -17,6 +17,15 @@ ENV_NAME_SSH_TARGET_LABELS = "SSH_TARGET_LABELS" ENV_SSH_TARGET_LABELS = os.getenv(ENV_NAME_SSH_TARGET_LABELS, "") +ENV_NAME_SSH_TARGET_PUBLICKEY_API_PORT = "SSH_TARGET_PUBLICKEY_API_PORT" +ENV_SSH_TARGET_PUBLICKEY_API_PORT = os.getenv(ENV_NAME_SSH_TARGET_PUBLICKEY_API_PORT, "") + +ENV_NAME_KUBERNETES_SERVICE_HOST = "KUBERNETES_SERVICE_HOST" +ENV_KUBERNETES_SERVICE_HOST = os.getenv(ENV_NAME_KUBERNETES_SERVICE_HOST, "") + +ENV_NAME_KUBERNETES_SERVICE_PORT = "KUBERNETES_SERVICE_PORT" +ENV_KUBERNETES_SERVICE_PORT = os.getenv(ENV_NAME_KUBERNETES_SERVICE_PORT, "") + if ENV_SSH_PERMIT_TARGET_HOST == "": print("The environment variable {} must be set.".format(ENV_NAME_PERMIT_TARGET_HOST)) exit(1) @@ -33,5 +42,8 @@ call("echo 'export {}={}' >> {}".format(ENV_NAME_PERMIT_TARGET_HOST, ENV_SSH_PERMIT_TARGET_HOST, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) call("echo 'export {}={}' >> {}".format(ENV_NAME_MANUAL_AUTH_FILE, ENV_MANUAL_AUTH_FILE, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) call("echo 'export {}={}' >> {}".format(ENV_NAME_SSH_TARGET_LABELS, ENV_SSH_TARGET_LABELS, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) +call("echo 'export {}={}' >> {}".format(ENV_NAME_SSH_TARGET_PUBLICKEY_API_PORT, ENV_SSH_TARGET_PUBLICKEY_API_PORT, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) +call("echo 'export {}={}' >> {}".format(ENV_NAME_KUBERNETES_SERVICE_HOST, ENV_KUBERNETES_SERVICE_HOST, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) +call("echo 'export {}={}' >> {}".format(ENV_NAME_KUBERNETES_SERVICE_PORT, ENV_KUBERNETES_SERVICE_PORT, os.getenv("SSHD_ENVIRONMENT_VARIABLES")), shell=True) call("/usr/local/sbin/sshd -D -f " + SSHD_CONFIG, shell=True)