summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-12-27 11:06:14 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-12-27 11:06:14 +0100
commitd398482dc9eb34d44c1997eeb2650880ded350d7 (patch)
tree6b7ac7abf9f219c9f848171d3fba22cc8a038ac0
parent78211d7aabf6d7612e5c94cecbd40eb3c29a48d6 (diff)
[DMaaP] Wait for AAF locate before AAF config
AAF config needs to have aaf locate service up and running in order to work properly (if not, it won't really crash but won't have done the real work). As per https://kubernetes.io/docs/concepts/workloads/pods/init-containers/#understanding-init-containers, "Each init container must complete must complete successfully before the next one starts". Adding a wait for readiness container before aaf config init containers should then do the job. Change-Id: Ida047728e4f14320ada8052c707b458450f4923b Issue-ID: DMAAP-1362 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml14
1 files changed, 14 insertions, 0 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index 52ac9eb6f3..96839b52d7 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -46,6 +46,20 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
{{- if .Values.global.aafEnabled }}
+ - name: {{ include "common.name" . }}-aaf-readiness
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aaf-locate
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-dr-prov-aaf-config
image: "{{ include "common.repository" . }}/{{ .Values.global.aafAgentImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}