From fca50096dc1de26e7f740e20ec3452248cbb44ae Mon Sep 17 00:00:00 2001 From: hosingh000 Date: Thu, 10 May 2018 13:53:58 -0500 Subject: [PATCH] Fix minor chart issues due to osh changes Incorporated to Pass git key and config through value Signed-off-by: Hari Om Singh Change-Id: I2ebc86ce0fe371379468c0482e705773a553e517 --- ranger-agent/templates/secret-ssh-key.yaml | 4 ++-- ranger-agent/values.yaml | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ranger-agent/templates/secret-ssh-key.yaml b/ranger-agent/templates/secret-ssh-key.yaml index c5d100a9..ec2dfc3b 100755 --- a/ranger-agent/templates/secret-ssh-key.yaml +++ b/ranger-agent/templates/secret-ssh-key.yaml @@ -28,6 +28,6 @@ data: USER: {{ .Values.conf.ssh.user | b64enc }} USER_HOME: {{ .Values.conf.ssh.user_home | b64enc }} SSH_KEY_FILE: {{ .Values.conf.ssh.ssh_key_file | b64enc }} - RANGER_AGENT_PRIVATE_KEY: {{ .Files.Get .Values.conf.ssh.ssh_key_file_location | b64enc }} - RANGER_AGENT_SSH_CONFIG: {{ .Files.Get .Values.conf.ssh.ssh_config_file_location | b64enc }} + RANGER_AGENT_PRIVATE_KEY: {{ .Values.conf.ssh.ssh_key | default "" | b64enc }} + RANGER_AGENT_SSH_CONFIG: {{ .Values.conf.ssh.ssh_config | default "" | b64enc }} {{- end }} diff --git a/ranger-agent/values.yaml b/ranger-agent/values.yaml index 82babf24..596c3d10 100755 --- a/ranger-agent/values.yaml +++ b/ranger-agent/values.yaml @@ -93,9 +93,8 @@ conf: user: ranger_agent user_home: /home/ranger_agent ssh_key_file: ranger_agent - ssh_key_file_location: cert/ranger_agent - ssh_config_file_location: cert/config - + ssh_key: null + ssh_config: null network: api: ingress: @@ -230,7 +229,7 @@ endpoints: default: rabbitmq host_fqdn_override: default: null - path: / + path: /ranger-agent scheme: rabbit port: amqp: @@ -240,7 +239,7 @@ endpoints: ranger_rds: name: rds-url hosts: - default: rds + default: rds-server host_fqdn_override: default: null path: