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

[oom.git] / kubernetes / message-router / templates / message-router-kafka.yaml

diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index cb2f3e9..509b15f 100644 (file)
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: global-kafka
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-message-router"
 spec:
   selector:
     matchLabels:
@@ -12,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 }}
@@ -52,7 +42,7 @@ spec:
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.onap-message-router:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "global-kafka"
         - name: KAFKA_BROKER_ID
@@ -62,22 +52,24 @@ spec:
         - name: KAFKA_PORT
           value: "9092"
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /var/run/docker.sock
           name: docker-socket
         - mountPath: /kafka
           name: kafka-data
-        - mountPath: /start-kafka.sh
-          name: start-kafka
       restartPolicy: Always
       volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       - name: docker-socket
         hostPath:
           path: /var/run/docker.sock
       - name: kafka-data
-        hostPath:
-          path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
-      - name: start-kafka
-        hostPath:
-          path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
+        persistentVolumeClaim:
+          claimName: message-router-kafka
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}