message-router K8S-Helm Parameterization

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

diff --git a/kubernetes/message-router/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
similarity index 79%
rename from kubernetes/message-router/message-router-dmaap.yaml
rename to kubernetes/message-router/templates/message-router-dmaap.yaml
index 8d85b8f..eda5093 100644 (file)
--- a/kubernetes/message-router/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: dmaap
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -34,15 +35,15 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "dmaap-readiness"
           }
           ]'
     spec:
       containers:
-      - image: attos/dmaap:latest
-        imagePullPolicy: Always
+      - image: {{ .Values.image.dmaap }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: dmaap
         ports:
         - containerPort: 3904
@@ -63,12 +64,12 @@ spec:
       volumes:
       - name: appprops
         hostPath:
-          path: /dockerdata-nfs/onapdemo/message-router/dmaap/MsgRtrApi.properties
+          path: /dockerdata-nfs/onap/message-router/dmaap/MsgRtrApi.properties
       - name: cadi
         hostPath:
-          path: /dockerdata-nfs/onapdemo/message-router/dmaap/cadi.properties
+          path: /dockerdata-nfs/onap/message-router/dmaap/cadi.properties
       - name: mykey
         hostPath:
-          path: /dockerdata-nfs/onapdemo/message-router/dmaap/mykey
+          path: /dockerdata-nfs/onap/message-router/dmaap/mykey
       imagePullSecrets:
       - name: onap-docker-registry-key