diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2017-12-15 14:47:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-15 14:47:37 +0000 |
commit | 5ac02a0410e9959c15f3ec0640bd120a31695966 (patch) | |
tree | 8fb15fd423db417b510cbc3b5f1535fbea959323 /kubernetes/message-router/templates/message-router-kafka.yaml | |
parent | 1d342e1638388fccda18ca4ab9ccabf9138d8ede (diff) | |
parent | 3561e0168723ad1850765e116f52b11048b9bc12 (diff) |
Merge "Update annotations to spec for message-router"
Diffstat (limited to 'kubernetes/message-router/templates/message-router-kafka.yaml')
-rw-r--r-- | kubernetes/message-router/templates/message-router-kafka.yaml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml index 3e2628b750..ab12c28cec 100644 --- a/kubernetes/message-router/templates/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -13,33 +13,22 @@ spec: labels: app: global-kafka name: global-kafka - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--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": "kafka-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - zookeeper + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: kafka-readiness containers: - image: {{ .Values.image.kafka }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -88,4 +77,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} |