CORD-3112 Fix key problems in synchronizers
Change-Id: Ie117040e9c84009167009d391de7cacbd5ed490b
diff --git a/xos-services/hssdb/templates/_helpers.tpl b/xos-services/hssdb/templates/_helpers.tpl
index fec2d8d..2ac6d58 100644
--- a/xos-services/hssdb/templates/_helpers.tpl
+++ b/xos-services/hssdb/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index a4b610b..9b4511d 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: hssdb-keys
mountPath: /opt/xos/services/hssdb/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: hssdb-config
configMap:
@@ -68,6 +71,12 @@
- name: hssdb-keys
secret:
secretName: hssdb-keys
+ defaultMode: 256
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/hssdb/values.yaml b/xos-services/hssdb/values.yaml
index d663dd5..e5d4ae6 100644
--- a/xos-services/hssdb/values.yaml
+++ b/xos-services/hssdb/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}