From 364b9ad1e3126df5c87804beab36441455aca0c1 Mon Sep 17 00:00:00 2001 From: kiranya Date: Thu, 23 Nov 2017 07:28:50 +0000 Subject: Update annotations to spec for clamp Issue-ID: OOM-457 Change-Id: Iff847c80ea1af0c9cfdc427fd23f4b310e12a72e Signed-off-by: kiranya --- kubernetes/clamp/templates/clamp-deployment.yaml | 43 +++++++++--------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'kubernetes/clamp/templates') diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml index 493bb49b9e..0f3913ce91 100644 --- a/kubernetes/clamp/templates/clamp-deployment.yaml +++ b/kubernetes/clamp/templates/clamp-deployment.yaml @@ -15,33 +15,22 @@ spec: labels: app: clamp name: clamp - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "clamp-mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "clamp-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - clamp-mariadb + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: clamp-readiness containers: - env: - name: SPRING_APPLICATION_JSON @@ -58,4 +47,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key -#{{ end }} \ No newline at end of file +#{{ end }} -- cgit 1.2.3-korg