diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2017-12-15 15:44:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-12-15 15:44:35 +0000 |
| commit | 43d085b521d5be0df7ecfd39215b24cae3a140fd (patch) | |
| tree | aeb81709c7c5f0fe8c04e4b98d222d3d29d93383 | |
| parent | 8db8b1825e199e295a2429c450d6cc9f5825c2e1 (diff) | |
| parent | 364b9ad1e3126df5c87804beab36441455aca0c1 (diff) | |
Merge "Update annotations to spec for clamp"
| -rw-r--r-- | kubernetes/clamp/templates/clamp-deployment.yaml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml index 61091a87f3..de9adaca81 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 @@ -59,4 +48,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key -#{{ end }}
\ No newline at end of file +#{{ end }} |