summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-bpmn-infra
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-bpmn-infra
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-bpmn-infra')
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml8
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/templates/service.yaml4
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/values.yaml2
4 files changed, 12 insertions, 4 deletions
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index 360936d2ba..9feab4ddce 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -17,7 +17,11 @@ aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
dme2:
timeout: '30000'
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
@@ -158,7 +162,11 @@ mso:
oof:
auth: {{ .Values.mso.oof.auth }}
callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
+ {{ if (include "common.needTLS" .) }}
endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ else }}
+ endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ end }}
timeout: PT30M
workflow:
CreateGenericVNFV1:
diff --git a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml
index 57a2b2c689..2b8b827f91 100755
--- a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/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-bpmn-infra/templates/service.yaml b/kubernetes/so/components/so-bpmn-infra/templates/service.yaml
index 6eb6f27e26..5b8dee0774 100755
--- a/kubernetes/so/components/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/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" . }}
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index d5ff829cc7..af185aeb4e 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -123,7 +123,7 @@ service:
type: ClusterIP
internalPort: *containerPort
externalPort: 8081
- portName: so-bpmn-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1