From dc55bbc3208daa4753e5bf83a27157d9d3aeac67 Mon Sep 17 00:00:00 2001 From: kiranya Date: Wed, 22 Nov 2017 14:22:04 +0000 Subject: Update annotations to spec for dcae Issue-ID: OOM-406 Change-Id: Idffd375989e638e4541eea6c39275b313b6ea339 Signed-off-by: kiranya --- kubernetes/dcae/templates/cdap0-dep.yaml | 25 ++++++---------- kubernetes/dcae/templates/cdap1-dep.yaml | 25 ++++++---------- kubernetes/dcae/templates/cdap2-dep.yaml | 25 ++++++---------- kubernetes/dcae/templates/dcae-dmaap.yaml | 47 ++++++++++++------------------- kubernetes/dcae/templates/dcae-kafka.yaml | 43 +++++++++++----------------- 5 files changed, 61 insertions(+), 104 deletions(-) (limited to 'kubernetes/dcae') diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml index c6239e219b..37d7d58a16 100644 --- a/kubernetes/dcae/templates/cdap0-dep.yaml +++ b/kubernetes/dcae/templates/cdap0-dep.yaml @@ -22,22 +22,15 @@ spec: labels: app: cdap0 name: cdap0 - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "name": "create-fs", - "image": "{{ .Values.image.cdapfs }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "command": ["/bin/bash", "-c", "mkdir -p /cdap/{cdap0-opt-tools,cdap0-opt-data,pod-ip}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"], - "volumeMounts": [ - { - "mountPath": "/cdap", - "name": "cdap-root" - } - ] - } - ]' spec: + initContainers: + - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap0-opt-tools,cdap0-opt-data,pod-ip}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"] + name: create-fs + image: {{ .Values.image.cdapfs }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /cdap + name: cdap-root hostname: zldcprivatecloudtruecdap00 containers: - image: {{ .Values.image.cdap }} @@ -83,4 +76,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml index 64f69d32dd..7529777038 100644 --- a/kubernetes/dcae/templates/cdap1-dep.yaml +++ b/kubernetes/dcae/templates/cdap1-dep.yaml @@ -22,22 +22,15 @@ spec: labels: app: cdap1 name: cdap1 - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "name": "create-fs", - "image": "{{ .Values.image.cdapfs }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "command": ["/bin/bash", "-c", "mkdir -p /cdap/{cdap1-opt-tools,cdap1-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"], - "volumeMounts": [ - { - "mountPath": "/cdap", - "name": "cdap-root" - } - ] - } - ]' spec: + initContainers: + - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap1-opt-tools,cdap1-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"] + name: create-fs + image: {{ .Values.image.cdapfs }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /cdap + name: cdap-root hostname: zldcprivatecloudtruecdap01 containers: - image: {{ .Values.image.cdap }} @@ -83,4 +76,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml index f6d6ec70e4..d146894e56 100644 --- a/kubernetes/dcae/templates/cdap2-dep.yaml +++ b/kubernetes/dcae/templates/cdap2-dep.yaml @@ -22,22 +22,15 @@ spec: labels: app: cdap2 name: cdap2 - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "name": "create-fs", - "image": "{{ .Values.image.cdapfs }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "command": ["/bin/bash", "-c", "mkdir -p /cdap/{cdap2-opt-tools,cdap2-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"], - "volumeMounts": [ - { - "mountPath": "/cdap", - "name": "cdap-root" - } - ] - } - ]' spec: + initContainers: + - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap2-opt-tools,cdap2-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3]; do sleep 1; done"] + name: create-fs + image: {{ .Values.image.cdapfs }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /cdap + name: cdap-root hostname: zldcprivatecloudtruecdap02 containers: - image: {{ .Values.image.cdap }} @@ -83,4 +76,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml index 885620b18d..46c2e65b46 100644 --- a/kubernetes/dcae/templates/dcae-dmaap.yaml +++ b/kubernetes/dcae/templates/dcae-dmaap.yaml @@ -13,35 +13,24 @@ spec: labels: app: dmaap name: dmaap - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "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 + - 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 }} @@ -74,4 +63,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} \ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml index 9bfca2bd94..de18137235 100644 --- a/kubernetes/dcae/templates/dcae-kafka.yaml +++ b/kubernetes/dcae/templates/dcae-kafka.yaml @@ -13,33 +13,22 @@ spec: labels: app: kafka name: 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 }} @@ -82,4 +71,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/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 }} -- cgit 1.2.3-korg