diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2017-12-15 14:44:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-15 14:44:45 +0000 |
commit | 3bcdbc10ecfc127eb89a6ef77e8bc2f6b8b9ab7f (patch) | |
tree | 3c97b8bb26344b0519d828900cfa90e05b98ea03 /kubernetes/dcae/templates/dcae-dmaap.yaml | |
parent | 4ad5bad29a9c75863424e1090fb82342a7eaaab0 (diff) | |
parent | dc55bbc3208daa4753e5bf83a27157d9d3aeac67 (diff) |
Merge "Update annotations to spec for dcae"
Diffstat (limited to 'kubernetes/dcae/templates/dcae-dmaap.yaml')
-rw-r--r-- | kubernetes/dcae/templates/dcae-dmaap.yaml | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml index 885620b18d..46c2e65b46 100644 --- a/kubernetes/dcae/templates/dcae-dmaap.yaml +++ b/kubernetes/dcae/templates/dcae-dmaap.yaml @@ -13,35 +13,24 @@ spec: labels: app: dmaap name: dmaap - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "kafka", - "--container-name", - "zookeeper" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "dmaap-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - kafka + - --container-name + - zookeeper + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: dmaap-readiness containers: - image: {{ .Values.image.dmaap }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -74,4 +63,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} |