summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-etsi-sol005-adapter
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-04-29 13:33:02 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2022-05-19 17:28:20 +0200
commit17be962a2bd43768a41705f0d009166e2894d82d (patch)
treee828b54a3daa6286b6884ff974d19fb3e208f552 /kubernetes/so/components/so-etsi-sol005-adapter
parent618cfffd44e5a9d187e6a89586b00fb0737f81a7 (diff)
[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 <andreas-geissler@telekom.de> Change-Id: I5b333ab19673ad248fd2e3bd138a99fe15025f5e
Diffstat (limited to 'kubernetes/so/components/so-etsi-sol005-adapter')
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml4
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml6
3 files changed, 8 insertions, 4 deletions
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index dd46da0989..e1e2fc23c6 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -45,7 +45,11 @@ mso:
msb-port: 80
adapters:
requestDb:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ else }}
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
#Actuator
management:
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
index 4f8f4d9f26..1abf21816b 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
@@ -94,7 +94,7 @@ spec:
failureThreshold: {{ .Values.livenessProbe.failureThreshold}}
ports:
- containerPort: {{ .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
index 2ecc66f233..5b8dee0774 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
@@ -29,12 +29,12 @@ 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" . }}
- release: {{ include "common.release" . }} \ No newline at end of file
+ release: {{ include "common.release" . }}