diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-04-01 03:32:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-01 03:32:27 +0000 |
| commit | 8cdc31f786753fb952a95e9639da9b71b27ad08a (patch) | |
| tree | ea031c84e94e2a7f0de58d62ac676c55d3b6bae0 /kubernetes/sdc/charts/sdc-wfd-be/templates | |
| parent | bc3d9a6fe6a3ea4555cf71900b7cc6417c6c2302 (diff) | |
| parent | 5698c8336a4ee58e396654c1463cd7b104d0f9be (diff) | |
Merge "Support HTTPS and SSL Cassandra in workflow"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-wfd-be/templates')
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/_helper.tpl | 29 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml | 26 |
2 files changed, 32 insertions, 23 deletions
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/_helper.tpl b/kubernetes/sdc/charts/sdc-wfd-be/templates/_helper.tpl new file mode 100644 index 0000000000..c69fb7c81c --- /dev/null +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/_helper.tpl @@ -0,0 +1,29 @@ +{{- define "sdc-wfd-be.volumes" }} + {{ if .Values.config.cassandraSSLEnabled }} + - name: {{ include "common.fullname" . }}-cassandra-client-truststore + hostPath: + path: /etc/cassandra-client-truststore/truststore + type: File + {{- end }} + {{ if .Values.config.serverSSLEnabled }} + - name: {{ include "common.fullname" . }}-server-https-keystore + hostPath: + path: /config/server-https-keystore/keystore + type: File + {{- end }} +{{- end }} + +{{- define "sdc-wfd-be.volumeMounts" }} + {{ if .Values.config.cassandraSSLEnabled }} + - name: {{ include "common.fullname" . }}-cassandra-client-truststore + mountPath: /etc/cassandra-client-truststore/truststore + subPath: truststore + readOnly: true + {{- end }} + {{ if .Values.config.serverSSLEnabled }} + - name: {{ include "common.fullname" . }}-server-https-keystore + mountPath: /etc/server-https-keystore/keystore + subPath: keystore + readOnly: true + {{- end }} +{{- end }}
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml index 26ad05555a..bb96d342f7 100644 --- a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml @@ -101,34 +101,14 @@ spec: - name: SERVER_SSL_ENABLED value: "{{ .Values.config.serverSSLEnabled }}" - name: SERVER_SSL_KEYSTORE_TYPE - value: "{{ .Values.config.ser }}" + value: "{{ .Values.config.serverSSLKeyStoreType }}" - name: SERVER_SSL_KEYSTORE_PATH value: "{{ .Values.config.serverSSLKeyStorePath }}" - name: SERVER_SSL_KEY_PASSWORD value: "{{ .Values.config.serverSSLKeyPassword }}" volumeMounts: - {{ if .Values.config.cassandraSSLEnabled }} - - name: {{ include "common.fullname" . }}-cassandra-client-truststore - mountPath: /config/cassandra-client-truststore - subPath: truststore - readOnly: true - {{- end }} - {{ if .Values.config.serverSSLEnabled }} - - name: {{ include "common.fullname" . }}-server-https-keystore - mountPath: /config/server-https-keystore - subPath: keystore - readOnly: true - {{- end }} + {{- template "sdc-wfd-be.volumeMounts" . }} volumes: - {{ if .Values.config.cassandraSSLEnabled }} - - name: {{ include "common.fullname" . }}-cassandra-client-truststore - hostPath: - path: /config/cassandra-client-truststore - {{- end }} - {{ if .Values.config.serverSSLEnabled }} - - name: {{ include "common.fullname" . }}-server-https-keystore - hostPath: - path: /config/server-https-keystore - {{- end }} + {{- template "sdc-wfd-be.volumes" . }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |