summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2017-12-15 14:47:37 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-15 14:47:37 +0000
commit5ac02a0410e9959c15f3ec0640bd120a31695966 (patch)
tree8fb15fd423db417b510cbc3b5f1535fbea959323
parent1d342e1638388fccda18ca4ab9ccabf9138d8ede (diff)
parent3561e0168723ad1850765e116f52b11048b9bc12 (diff)
Merge "Update annotations to spec for message-router"
-rw-r--r--kubernetes/message-router/templates/message-router-dmaap.yaml47
-rw-r--r--kubernetes/message-router/templates/message-router-kafka.yaml43
2 files changed, 34 insertions, 56 deletions
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 67d51fd00e..1d9777e760 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -13,35 +13,24 @@ spec:
labels:
app: dmaap
name: dmaap
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "global-kafka",
- "--container-name",
- "zookeeper"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "dmaap-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - global-kafka
+ - --container-name
+ - zookeeper
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: dmaap-readiness
containers:
- image: {{ .Values.image.dmaap }}
imagePullPolicy: {{ .Values.pullPolicy }}
@@ -80,4 +69,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-{{ end }} \ No newline at end of file
+{{ end }}
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 3e2628b750..ab12c28cec 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -13,33 +13,22 @@ spec:
labels:
app: global-kafka
name: global-kafka
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "zookeeper"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "kafka-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - zookeeper
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: kafka-readiness
containers:
- image: {{ .Values.image.kafka }}
imagePullPolicy: {{ .Values.pullPolicy }}
@@ -88,4 +77,4 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}