diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2017-12-15 15:44:19 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-15 15:44:19 +0000 |
commit | d3dff5689023e6ce18b8b5cdc865ff04df572a29 (patch) | |
tree | 0735e00c2825ff5f11f66f93cf12b3d78639f206 /kubernetes/mso/templates/mso-deployment.yaml | |
parent | 9d932016e610293305f4446eafcbc9183a21112a (diff) | |
parent | 09f7b38e7d240d2f7703063c667c0b1d188879fa (diff) |
Merge "Update annotations to spec for mso"
Diffstat (limited to 'kubernetes/mso/templates/mso-deployment.yaml')
-rw-r--r-- | kubernetes/mso/templates/mso-deployment.yaml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index b9ee3c7f98..2abb29091f 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -14,33 +14,22 @@ spec: labels: app: mso name: mso - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "mso-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - mariadb + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: mso-readiness containers: - command: - /tmp/start-jboss-server.sh @@ -155,4 +144,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} |