summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2017-12-15 14:48:14 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-15 14:48:14 +0000
commit8643a044fec4540ee03ca4c8729f17c6e430fc6a (patch)
tree2be486cee29674ac2dc7ba6daf20e3be379696ac
parent5ac02a0410e9959c15f3ec0640bd120a31695966 (diff)
parentf2772b63bdecced7885a615f76d8a21663740292 (diff)
Merge "Update annotations to spec for vid"
-rw-r--r--kubernetes/vid/templates/vid-server-deployment.yaml41
1 files changed, 15 insertions, 26 deletions
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 5354dbac77..832fdeb93c 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -15,33 +15,22 @@ spec:
labels:
app: vid-server
name: vid-server
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "vid-mariadb"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "vid-server-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - vid-mariadb
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: vid-server-readiness
containers:
- env:
- name: ASDC_CLIENT_REST_HOST