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/templates | |
| 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/templates')
| -rw-r--r-- | kubernetes/multicloud/templates/deployment.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/multicloud/templates/service.yaml | 8 |
2 files changed, 12 insertions, 8 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 }} diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml index 3f950db038..1c483b0d2d 100644 --- a/kubernetes/multicloud/templates/service.yaml +++ b/kubernetes/multicloud/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.portName }} + name: {{ .Values.service.name }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -33,7 +33,11 @@ metadata: "url": "/api/multicloud/v0", "protocol": "REST", "port": "{{ .Values.service.externalPort }}", + {{if (include "common.needTLS" .) -}} "enable_ssl": {{ .Values.config.ssl_enabled }}, + {{- else -}} + "enable_ssl": false, + {{- end}} "visualRange": "1" }, { @@ -42,7 +46,7 @@ metadata: "url": "/api/multicloud/v1", "protocol": "REST", "port": "{{ .Values.service.externalPort }}", - "enable_ssl": {{ .Values.config.ssl_enabled }}, + "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}, "visualRange": "1" } ]' |