diff options
| author |   Fiachra Corcoran <fiachra.corcoran@est.tech> | 2022-09-23 18:54:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-09-23 18:54:14 +0000 |
| commit | 54a46829db2c1119f3baa12de63f584d03aba8cd (patch) | |
| tree | 262ad4004248193c0b2d2da4719d4df82968e881 /kubernetes/multicloud/templates/deployment.yaml | |
| parent | e80759dab867db25cb72b750fe60484a28bed1d4 (diff) | |
| parent | dfa23c83cc8630915824968ba7b043ef968e38b6 (diff) | |
Merge "[MULTICLOUD] Service mesh compatibility"
Diffstat (limited to 'kubernetes/multicloud/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/multicloud/templates/deployment.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml index 53716e5f44..ff9dac1898 100644 --- a/kubernetes/multicloud/templates/deployment.yaml +++ b/kubernetes/multicloud/templates/deployment.yaml @@ -40,15 +40,15 @@ spec: containers: - env: - name: MSB_PROTO - value: {{ .Values.config.msbprotocol }} + value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}" - name: MSB_ADDR - value: {{ .Values.config.msbgateway }}.{{ include "common.namespace" . }} + value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}" - name: MSB_PORT - value: "{{ .Values.config.msbPort }}" + value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.msbPort }}{{ else }}{{ .Values.config.msbPlainPort }}{{ end }}" - name: AAI_ADDR value: "aai.{{ include "common.namespace" . }}" - name: AAI_PORT - value: "{{ .Values.config.aai.port }}" + value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.aai.aaiPort }}{{ else }}{{ .Values.config.aai.aaiPlainPort }}{{ end }}" - name: AAI_SCHEMA_VERSION value: "{{ .Values.config.aai.schemaVersion }}" - name: AAI_USERNAME @@ -56,7 +56,7 @@ spec: - name: AAI_PASSWORD value: "{{ .Values.config.aai.password }}" - name: SSL_ENABLED - value: "{{ .Values.config.ssl_enabled }}" + value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}" resources: {{ include "common.resources" . | indent 12 }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} @@ -80,7 +80,7 @@ spec: httpGet: path: /api/multicloud/v0/swagger.json port: {{ .Values.service.internalPort }} - scheme: HTTPS + scheme: "{{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}" initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} |