diff options
Diffstat (limited to 'kubernetes/message-router')
| -rw-r--r-- | kubernetes/message-router/templates/message-router-dmaap.yaml | 47 | ||||
| -rw-r--r-- | kubernetes/message-router/templates/message-router-kafka.yaml | 48 |
2 files changed, 34 insertions, 61 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..509b15fc53 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 }} @@ -70,8 +59,6 @@ spec: name: docker-socket - mountPath: /kafka name: kafka-data - - mountPath: /start-kafka.sh - name: start-kafka restartPolicy: Always volumes: - name: localtime @@ -83,9 +70,6 @@ spec: - name: kafka-data persistentVolumeClaim: claimName: message-router-kafka - - name: start-kafka - hostPath: - 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 }} |