From b087a8b55875bd0a100ba2cbfda376bab716741b Mon Sep 17 00:00:00 2001 From: kooper Date: Thu, 4 Apr 2019 14:03:36 +0000 Subject: Certificate location is configurable Change-Id: I05cf96dd21c891312a5b5e67da3baf7a37e50e54 Issue-ID: SDC-2195 Signed-off-by: kooper --- sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml | 7 +++++++ sdc-os-chef/kubernetes/sdc/values.yaml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'sdc-os-chef/kubernetes') diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml index 267b3bb3d2..b2bab6c752 100644 --- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml +++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml @@ -74,6 +74,8 @@ spec: name: sdc-logs-2 - mountPath: /tmp/logback.xml name: sdc-logback + - mountPath: "{{ .Values.certDir }}" + name: sdc-cert-dir env: - name: ENVNAME value: "{{ .Values.env.name }}" @@ -93,6 +95,8 @@ spec: value: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g" - name: cassandra_ssl_enabled value: "false" + - name: SDC_CERT_DIR + value: "{{ .Values.certDir }}" lifecycle: postStart: exec: @@ -107,6 +111,9 @@ spec: - name: filebeat-conf hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: sdc-cert-dir + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/cert - name: sdc-logs-2 emptyDir: {} - name: sdc-data-filebeat diff --git a/sdc-os-chef/kubernetes/sdc/values.yaml b/sdc-os-chef/kubernetes/sdc/values.yaml index d871190321..4fd2e3c40e 100644 --- a/sdc-os-chef/kubernetes/sdc/values.yaml +++ b/sdc-os-chef/kubernetes/sdc/values.yaml @@ -21,4 +21,6 @@ env: secrets: sdc_user: YXNkY191c2Vy sdc_password: QWExMjM0JV4h - cs_password: b25hcDEyMyNAIQ== \ No newline at end of file + cs_password: b25hcDEyMyNAIQ== + +certDir: /var/lib/jetty/cert \ No newline at end of file -- cgit 1.2.3-korg