aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-04-19 18:10:52 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2022-07-29 12:58:54 +0200
commit0d5c917c02b40b335251a39952bb46f70bcb73ce (patch)
treeddf48aebc1c90ffd1e2c7654c61799e5d7d1317a /kubernetes/dmaap
parentc8964e507dfc9b32a0f29f2a67ce74b1f8a260b9 (diff)
[DMAAP] DMaaP ServiceMesh compatibility
Remove the dependency to AAF during the deployment of the DMaaP Bus Controller, as it is not used in ServishMesh usecase Added a change to the job to use http interface and delete Istio sidecar Issue-ID: OOM-2820 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I81f41bc06fe8db260636a17e66ffbabd58f01d74
Diffstat (limited to 'kubernetes/dmaap')
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml4
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml3
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/values.yaml5
3 files changed, 10 insertions, 2 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
index c9b6800ffd..a0c315426c 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
{{ include "common.podSecurityContext" . | indent 6 | trim}}
-{{- if or .Values.global.aafEnabled .Values.PG.enabled }}
+{{- if .Values.PG.enabled }}
initContainers:
- command:
- sh
@@ -45,6 +45,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
{{ include "common.certInitializer.initContainer" . | nindent 6 }}
+{{- if .Values.global.aafEnabled }}
- name: {{ include "common.name" . }}-permission-fixer
securityContext:
runAsUser: 0
@@ -62,6 +63,7 @@ spec:
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
command: ["/bin/sh"]
args: [ "-c", "sed -i -e '/cadi_keystore_password=/d' -e '/cadi_keystore_password_jks/p' -e 's/cadi_keystore_password_jks/cadi_keystore_password/' -e 's/dmaap-bc.p12/dmaap-bc.jks/' /opt/app/osaaf/local/org.onap.dmaap-bc.cred.props" ]
+{{- end }}
- name: {{ include "common.name" . }}-postgres-readiness
securityContext:
runAsUser: 100
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
index 039abaaf1f..ab6f573a34 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
@@ -32,7 +32,7 @@ spec:
env:
- name: DELAY
value: "0"
- {{- if .Values.global.allow_http }}
+ {{- if or (include "common.onServiceMesh" .) .Values.global.allow_http }}
- name: PROTO
value: "http"
- name: PORT
@@ -60,6 +60,7 @@ spec:
- name: {{ include "common.fullname" . }}-topics
mountPath: /opt/app/config/topics/
resources: {{ include "common.resources" . | nindent 10 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
{{- end -}}
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index cc860823f9..bc8325a6dd 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -174,3 +174,8 @@ serviceAccount:
nameOverride: dmaap-bc
roles:
- read
+
+wait_for_job_container:
+ containers:
+ - 'dmaap-provisioning-job'
+