summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-04-29 09:22:02 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2022-04-29 10:40:25 +0200
commit6a5cefa02eaf50e5c782f4b484c3114d93b5427a (patch)
tree0cbc7d38b2554371bc38ca8d0d1de3a7518b15d8 /kubernetes
parent618cfffd44e5a9d187e6a89586b00fb0737f81a7 (diff)
[AAF] Make AAF ServiceMesh compatible
Allthough AAF is not needed for SM it might be required on exceptional cases. In this case the sidecar needs to be disabled for aaf-service and aaf-locate. Additionally the order of chart creation need to be fixed and the job of aaf-sms requires a sidecar killing. Issue-ID: OOM-2820 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I77a2b3da4c826cf294c791bee0d1159233934253
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aaf/components/Makefile5
-rw-r--r--kubernetes/aaf/components/aaf-sms/templates/job.yaml1
-rw-r--r--kubernetes/aaf/components/aaf-sms/values.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl4
4 files changed, 14 insertions, 1 deletions
diff --git a/kubernetes/aaf/components/Makefile b/kubernetes/aaf/components/Makefile
index f4c9784bc4..4a15d0251b 100644
--- a/kubernetes/aaf/components/Makefile
+++ b/kubernetes/aaf/components/Makefile
@@ -19,7 +19,10 @@ SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES :=
HELM_BIN := helm
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+PROCESSED_FIRST := aaf-templates
+TO_FILTER := $(PROCESSED_FIRST) $(EXCLUDES)
+
+HELM_CHARTS := $(PROCESSED_FIRST) $(filter-out $(TO_FILTER), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
index 8dbe276d97..2370cf60de 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -201,6 +201,7 @@ spec:
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
- name: localtime
hostPath:
diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index da268ccf06..114ad23672 100644
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -276,3 +276,8 @@ resources:
cpu: 25m
memory: 100Mi
unlimited: {}
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-preload'
+
diff --git a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
index 50da519a89..c0614b255e 100644
--- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
+++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
@@ -23,6 +23,10 @@ spec:
replicas: {{ .Values.replicaCount }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ {{- if (include "common.onServiceMesh" .) }}
+ annotations:
+ sidecar.istio.io/inject: "false"
+ {{- end }}
spec: {{ include "aaf.initContainers" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}