Policy 1.1 in Kubernetes

[oom.git] / kubernetes / policy / templates / dep-pap.yaml

diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index e7fe902..fcb590b 100644 (file)
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: pap
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-policy"
 spec:
   selector:
     matchLabels:
@@ -35,7 +35,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pap-readiness"
           },
@@ -69,7 +69,7 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pap
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pap
         ports:
@@ -86,6 +86,6 @@ spec:
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"