summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
authorvasundhra <vasundhra.choudhary@amdocs.com>2017-11-22 13:13:27 +0000
committervasundhra <vasundhra.choudhary@amdocs.com>2017-11-22 13:18:26 +0000
commitd76102d75fc5140cb21593ecf5d415f878fbf359 (patch)
tree000b2b26879b96afc61ece9a4fc73c86e1345bf3 /kubernetes/sdnc
parent1cee1a3eb985815da8d55ca7bcfa2bf3ac092d34 (diff)
Update annotations to spec for sdnc
Issue-ID: OOM-406 Change-Id: I0a05abedc71001a7d41806067e3adbd4e108f3f1 Signed-off-by: vasundhra <vasundhra.choudhary@amdocs.com>
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/templates/dgbuilder-deployment.yaml47
-rw-r--r--kubernetes/sdnc/templates/sdnc-deployment.yaml43
-rw-r--r--kubernetes/sdnc/templates/web-deployment.yaml47
3 files changed, 52 insertions, 85 deletions
diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
index 2fb4650a50..e0f8b298e9 100644
--- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
@@ -13,35 +13,24 @@ spec:
labels:
app: sdnc-dgbuilder
name: sdnc-dgbuilder
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "sdnc-db-container",
- "--container-name",
- "sdnc-controller-container"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "sdnc-dgbuilder-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - sdnc-db-container
+ - --container-name
+ - sdnc-controller-container
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: sdnc-dgbuilder-readiness
containers:
- command:
- /bin/bash
@@ -73,4 +62,4 @@ spec:
path: /etc/localtime
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index a9a9c0e155..1c88fffea9 100644
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -13,33 +13,22 @@ spec:
labels:
app: sdnc
name: sdnc
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "sdnc-db-container"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "sdnc-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - sdnc-db-container
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: sdnc-readiness
containers:
- command:
- /opt/onap/sdnc/bin/startODL.sh
@@ -103,4 +92,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml
index 9ab224bad6..fcd82a40c0 100644
--- a/kubernetes/sdnc/templates/web-deployment.yaml
+++ b/kubernetes/sdnc/templates/web-deployment.yaml
@@ -13,35 +13,24 @@ spec:
labels:
app: sdnc-portal
name: sdnc-portal
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "sdnc-db-container",
- "--container-name",
- "sdnc-controller-container"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "sdnc-portal-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - sdnc-db-container
+ - --container-name
+ - sdnc-controller-container
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: sdnc-portal-readiness
containers:
- command:
- /bin/bash
@@ -83,4 +72,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}