diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-05-13 16:54:43 +0200 |
|---|---|---|
| committer |   Jack Lucas <jflos@sonoris.net> | 2022-09-14 13:22:29 +0000 |
| commit | dfa23c83cc8630915824968ba7b043ef968e38b6 (patch) | |
| tree | e86e83dd0cbae293ce845ddb3d38bcb4ae40c448 /kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml | |
| parent | 8cd7e264e2a8d7f6686065f882b3b2f0663a6690 (diff) | |
[MULTICLOUD] Service mesh compatibility
Patch on MC charts dedicated to make http/https calls depending
on configuration for TLS. Include an updated version of the
framework-artifactbroker
Issue-ID: OOM-3015
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I03deae9dcea703540fe6e3a81ddba20505f246f1
Diffstat (limited to 'kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml index 2524cd8421..7f178063b5 100644 --- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml +++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml @@ -41,15 +41,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" . }}" - 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" . }} + 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 @@ -57,7 +57,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 }}" name: {{ include "common.name" . }} volumeMounts: - mountPath: "{{ .Values.log.path }}" @@ -79,7 +79,7 @@ spec: httpGet: path: /api/multicloud-starlingx/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 }} |