Policy 1.1 in Kubernetes

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

diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index f7d9bf3..c8a4f71 100644 (file)
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: pdp
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-policy"
 spec:
   replicas: 1
   selector:
@@ -38,7 +38,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pdp-readiness"
           }
@@ -49,7 +49,7 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pdp
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pdp
         ports:
@@ -65,6 +65,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"