moving certs and keys to k8s secrets

[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 eda5093..0579541 100644 (file)
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: dmaap
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-message-router"
 spec:
   selector:
     matchLabels:
@@ -64,12 +64,12 @@ spec:
       volumes:
       - name: appprops
         hostPath:
-          path: /dockerdata-nfs/onap/message-router/dmaap/MsgRtrApi.properties
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
       - name: cadi
         hostPath:
-          path: /dockerdata-nfs/onap/message-router/dmaap/cadi.properties
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
       - name: mykey
-        hostPath:
-          path: /dockerdata-nfs/onap/message-router/dmaap/mykey
+        secret:
+          secretName: secret-{{ .Values.nsPrefix }}-message-router
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"