From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 15 Dec 2017 20:21:26 +0000 (+0000)
Subject: Merge "Incorrect start-kafka.sh mounted to global-kafka"
X-Git-Tag: 2.0.0-ONAP~534
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a6eb9be0e091746c824b169a46242ef0943a2b05;hp=-c;p=oom.git

Merge "Incorrect start-kafka.sh mounted to global-kafka"
---

a6eb9be0e091746c824b169a46242ef0943a2b05
diff --combined kubernetes/message-router/templates/message-router-kafka.yaml
index ab12c28cec,8f04a40706..509b15fc53
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@@ -13,22 -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 }}
@@@ -59,8 -70,6 +59,6 @@@
            name: docker-socket
          - mountPath: /kafka
            name: kafka-data
-         - mountPath: /start-kafka.sh
-           name: start-kafka
        restartPolicy: Always
        volumes:
        - name: localtime
@@@ -72,9 -81,6 +70,6 @@@
        - 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 }}