Merge "Remove global repository from onap chart"

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

diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 0579541..a0c1380 100644 (file)
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -1,9 +1,25 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#{{ if not .Values.disableMessageRouterDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-dmaap
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.dmaapReplicas }}
   selector:
     matchLabels:
       app: dmaap
@@ -11,36 +27,25 @@ spec:
     metadata:
       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"
-          }
-          ]'
+      name: message-router-dmaap
     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 }}
@@ -54,22 +59,33 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
+          subPath: MsgRtrApi.properties
           name: appprops
         - mountPath: /appl/dmaapMR1/etc/cadi.properties
+          subPath: cadi.properties
           name: cadi
         - mountPath: /appl/dmaapMR1/etc/keyfile
+          subPath: mykey
           name: mykey
       restartPolicy: Always
       volumes:
-      - name: appprops
+      - name: localtime
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
+          path: /etc/localtime
+      - name: appprops
+        configMap:
+          name: mr-dmaap-msgrtrapi-prop-configmap
       - name: cadi
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
+        configMap:
+          name: mr-dmaap-cadi-prop-configmap
       - name: mykey
-        secret:
-          secretName: secret-{{ .Values.nsPrefix }}-message-router
+        configMap:
+          name: mr-dmaap-mykey-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+{{ end }}
+