diff options
author | 2017-12-15 14:40:08 +0000 | |
---|---|---|
committer | 2017-12-15 14:40:08 +0000 | |
commit | 419a83c15d637a92e3d34b5c85df051da084dec1 (patch) | |
tree | 41ac9dd0a9a8520a137c62706a5013d9669b9b33 /templates/aai-resources-deployment.yaml | |
parent | f0ce11b710f56332e38ba08f46e3f8ca2d0c109a (diff) | |
parent | 6eea480a156f1aef66a7df9e30be925231acad5c (diff) |
Merge "Update annotations to spec for aai"
Diffstat (limited to 'templates/aai-resources-deployment.yaml')
-rw-r--r-- | templates/aai-resources-deployment.yaml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml index ebf447f..2e46284 100644 --- a/templates/aai-resources-deployment.yaml +++ b/templates/aai-resources-deployment.yaml @@ -13,33 +13,22 @@ spec: labels: app: aai-resources name: aai-resources - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "hbase" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "aai-resources-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - hbase + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-resources-readiness containers: - name: aai-resources image: "{{ .Values.image.aaiResourcesImage }}:{{ .Values.image.aaiResourcesVersion}}" @@ -113,4 +102,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }} -#{{ end }}
\ No newline at end of file +#{{ end }} |