From f2772b63bdecced7885a615f76d8a21663740292 Mon Sep 17 00:00:00 2001 From: vasundhra Date: Wed, 22 Nov 2017 13:23:04 +0000 Subject: [PATCH] Update annotations to spec for vid Issue-ID: OOM-406 Change-Id: I5be4c7743006024a8e03f6b907ae177d5614fe48 Signed-off-by: vasundhra --- .../vid/templates/vid-server-deployment.yaml | 43 ++++++++-------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index d015135567..b97b27a6e3 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -15,33 +15,22 @@ spec: labels: app: vid-server name: vid-server - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "vid-mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vid-server-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - vid-mariadb + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vid-server-readiness containers: - env: - name: ASDC_CLIENT_REST_HOST @@ -132,4 +121,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} -- 2.16.6