From 2c0981b0751d2b2d0e9b5b0d697b05086550dcc5 Mon Sep 17 00:00:00 2001 From: kiranya Date: Wed, 22 Nov 2017 11:26:59 +0000 Subject: Update annotations to spec for vnfsdk Issue-ID: OOM-406 Change-Id: I6a62d2d3cdea132dd2a96cf0ac79861f186b8e22 Signed-off-by: kiranya --- .../vnfsdk/templates/refrepo-deployment.yaml | 43 ++++++++-------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml index 82f5f172db..0a56c740c1 100644 --- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml +++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml @@ -15,33 +15,22 @@ spec: labels: app: refrepo name: refrepo - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "postgres" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnfsdk-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - postgres + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + name: vnfsdk-readiness containers: - image: {{ .Values.image.refrepoImage }}:{{ .Values.image.refrepoVersion }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -53,4 +42,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key -#{{ end }} \ No newline at end of file +#{{ end }} -- cgit 1.2.3-korg