diff options
author | Andreas Geissler <andreas-geissler@telekom.de> | 2022-07-11 08:35:24 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2022-07-11 08:35:24 +0000 |
commit | a340b55885789113c7ca9305f9d020914495e285 (patch) | |
tree | 28434a59864f9f9506cbc1f94634360847fb75e3 /kubernetes/sdnc/components/sdnc-web/templates | |
parent | 4d5d6a0895e453466b443597e639336e1d8a6856 (diff) | |
parent | 58662a319d2e1f2a53eeceb06469658e4b070c50 (diff) |
Merge "[SDNC] SDNC ServiceMesh compatibility"
Diffstat (limited to 'kubernetes/sdnc/components/sdnc-web/templates')
-rw-r--r-- | kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml index 21416c9b5f..03432d3b63 100644 --- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml @@ -49,32 +49,34 @@ spec: {{ if .Values.liveness.enabled }} livenessProbe: tcpSocket: - port: {{ .Values.service.internalPort }} + port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end }} readinessProbe: tcpSocket: - port: {{ .Values.service.internalPort }} + port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: WEBPROTOCOL - value: {{ .Values.config.webProtocol }} + value: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webProtocol .Values.config.webPlainProtocol }} - name: WEBPORT - value: {{ .Values.config.webPort | quote }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webPort .Values.config.webPlainPort | quote }} - name: SDNRPROTOCOL - value: {{ .Values.config.sdnrProtocol }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrProtocol .Values.config.sdnrPlainProtocol }} - name: SDNRHOST - value: {{ .Values.config.sdnrHost }}.{{ include "common.namespace" . }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrHost .Values.config.sdnrPlainHost }}.{{ include "common.namespace" . }} - name: SDNRPORT - value: {{ .Values.config.sdnrPort | quote }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrPort .Values.config.sdnrPlainPort | quote }} + {{ if (include "common.needTLS" .) }} - name: SSL_CERT_DIR value: {{ .Values.config.sslCertDir }} - name: SSL_CERTIFICATE value: {{ .Values.config.sslCertiticate }} - name: SSL_CERTIFICATE_KEY value: {{ .Values.config.sslCertKey }} + {{ end }} {{ if .Values.config.transportpce.enabled }} - name: TRPCEURL value: {{ .Values.config.transportpce.transportpceUrl }} |