From 17be962a2bd43768a41705f0d009166e2894d82d Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Fri, 29 Apr 2022 13:33:02 +0200 Subject: [SO] Service mesh compatibility Patch on SO charts dedicated to allign the service port names according to Istio naming schema. Change the mariadb job to wait for the sidecar and kill it afterwards. Remove CertInitializer TLS job, if AAF is not enabled Added all missing changed from https://gerrit.onap.org/r/c/oom/+/124231 Issue-ID: OOM-2824 Signed-off-by: Andreas Geissler Change-Id: I5b333ab19673ad248fd2e3bd138a99fe15025f5e --- .../so/components/so-openstack-adapter/templates/deployment.yaml | 2 +- kubernetes/so/components/so-openstack-adapter/templates/service.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kubernetes/so/components/so-openstack-adapter/templates') diff --git a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml index f370fbd315..55493f7c42 100755 --- a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml @@ -87,7 +87,7 @@ spec: {{ include "so.helpers.livenessProbe" .| indent 8 }} ports: - containerPort: {{ index .Values.containerPort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }} protocol: TCP # Filebeat sidecar container {{ include "common.log.sidecar" . | nindent 6 }} diff --git a/kubernetes/so/components/so-openstack-adapter/templates/service.yaml b/kubernetes/so/components/so-openstack-adapter/templates/service.yaml index 6eb6f27e26..5b8dee0774 100755 --- a/kubernetes/so/components/so-openstack-adapter/templates/service.yaml +++ b/kubernetes/so/components/so-openstack-adapter/templates/service.yaml @@ -29,11 +29,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 }}{{ if (include "common.needTLS" .) }}s{{ end }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }} {{- end}} selector: app: {{ include "common.name" . }} -- cgit 1.2.3-korg