aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2017-12-15 15:44:33 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-15 15:44:33 +0000
commit8db8b1825e199e295a2429c450d6cc9f5825c2e1 (patch)
tree1c84c0961435d6c63f53cc0ea4e149c94228c222 /kubernetes
parentd3dff5689023e6ce18b8b5cdc865ff04df572a29 (diff)
parent8f2d17ed1dd18fc4a31fdb13997cdd9ff1a77a72 (diff)
Merge "Update annotations to spec for aaf"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aaf/templates/aaf-deployment.yaml43
1 files changed, 16 insertions, 27 deletions
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 56c99ea37f..6664f18886 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -15,33 +15,22 @@ spec:
labels:
app: aaf
name: aaf
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "aaf-cs"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "aaf-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aaf-cs
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: aaf-readiness
containers:
- env:
- name: CASSANDRA_CLUSTER
@@ -63,4 +52,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2
imagePullSecrets:
- name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }} \ No newline at end of file
+#{{ end }}