appc K8S-Helm Parameterization

[oom.git] / kubernetes / appc / templates / appc-deployment.yaml

diff --git a/kubernetes/appc/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
similarity index 85%
rename from kubernetes/appc/appc-deployment.yaml
rename to kubernetes/appc/templates/appc-deployment.yaml
index e2f2b4e..0bd93f8 100644 (file)
--- a/kubernetes/appc/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -32,8 +33,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "appc-readiness"
           }
           ]'
@@ -50,7 +51,8 @@ spec:
           value: /opt/openecomp/appc/data/properties
         - name: DMAAP_TOPIC_ENV
           value: SUCCESS
-        image: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest
+        image: {{ .Values.image.appc }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: appc-controller-container
         volumeMounts:
         - mountPath: /opt/openecomp/appc/data/properties
@@ -68,9 +70,9 @@ spec:
       volumes:
         - name: appc-conf
           hostPath:
-            path: /dockerdata-nfs/onapdemo/appc/conf
+            path: /dockerdata-nfs/onap/appc/conf
         - name: sdnc-conf
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdnc/conf
+            path: /dockerdata-nfs/onap/sdnc/conf
       imagePullSecrets:
       - name: onap-docker-registry-key