diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-09-14 14:00:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-09-14 14:00:16 +0000 |
| commit | f298897e7e5871bef78ca49b9b4bf9d2b0741658 (patch) | |
| tree | caeeb48491a8df75918a0c15c293f58a2a0955ac /kubernetes/aai/components/aai-sparky-be/templates | |
| parent | 3188824be7f3ba27c606d93b14e280fe01db9109 (diff) | |
| parent | 27fd7d8750ceeb798052eb8af36264c79b6536fb (diff) | |
Merge "[AAI] Service Mesh compatibility"
Diffstat (limited to 'kubernetes/aai/components/aai-sparky-be/templates')
| -rw-r--r-- | kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/aai/components/aai-sparky-be/templates/service.yaml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml index 7d0dfe39e2..7c09dcd228 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml @@ -39,6 +39,7 @@ spec: name: {{ include "common.name" . }} spec: initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }} + {{- if ( include "common.needTLS" .) }} - command: - sh args: @@ -66,6 +67,7 @@ spec: image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config + {{- end }} - command: - /app/ready.py args: diff --git a/kubernetes/aai/components/aai-sparky-be/templates/service.yaml b/kubernetes/aai/components/aai-sparky-be/templates/service.yaml index 4633472a3b..457b3576a0 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/service.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/service.yaml @@ -30,11 +30,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }} {{- else -}} - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - {{- end}} + name: {{ .Values.service.portName }}{{ ternary "s" "" (eq "true" (include "common.needTLS" .)) }} + {{- end }} selector: app: {{ include "common.name" . }} release: {{ include "common.release" . }} |