summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2017-12-15 14:43:29 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-15 14:43:29 +0000
commit4ad5bad29a9c75863424e1090fb82342a7eaaab0 (patch)
tree330012972205565bc5df674446993690685f4527
parentc32a6d50b4c2f9d890f06d6f711863f8f4a26bdb (diff)
parentfd583134103c4ef89fa58e74716c483f0fc4b878 (diff)
Merge "Update annotations to spec for appc"
-rw-r--r--kubernetes/appc/templates/appc-deployment.yaml43
-rw-r--r--kubernetes/appc/templates/dgbuilder-deployment.yaml47
2 files changed, 34 insertions, 56 deletions
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index e379c167d7..f4593b0d73 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -13,33 +13,22 @@ spec:
labels:
app: appc
name: appc
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "appc-db-container"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "appc-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - appc-db-container
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: appc-readiness
containers:
- command:
- /opt/openecomp/appc/bin/startODL.sh
@@ -112,4 +101,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index 32ccdafc3b..ed69c05f38 100644
--- a/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -13,35 +13,24 @@ spec:
labels:
app: appc-dgbuilder
name: appc-dgbuilder
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "appc-db-container",
- "--container-name",
- "appc-controller-container"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "appc-dgbuilder-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - appc-db-container
+ - --container-name
+ - appc-controller-container
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: appc-dgbuilder-readiness
containers:
- command:
- /bin/bash
@@ -73,4 +62,4 @@ spec:
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}