aai K8S-Helm Parameterization

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

diff --git a/kubernetes/aai/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
similarity index 82%
rename from kubernetes/aai/aai-deployment.yaml
rename to kubernetes/aai/templates/aai-deployment.yaml
index 857044d..286a9ac 100644 (file)
--- a/kubernetes/aai/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-service
+  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": "aai-service-readiness"
           }
           ]'
@@ -52,7 +53,8 @@ spec:
           value: noninteractive
         - name: JAVA_HOME
           value: /usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
+        image: {{ .Values.image.ajscAai }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: aai-service
         volumeMounts:
         - mountPath: /etc/ssl/certs/
@@ -74,16 +76,16 @@ spec:
       volumes:
         - name: aai-service-certs
           hostPath:
-            path: /dockerdata-nfs/onapdemo/aai/etc/ssl/certs/
+            path: /dockerdata-nfs/onap/aai/etc/ssl/certs/
         - name: aai-service-logroot
           hostPath:
-            path: /dockerdata-nfs/onapdemo/aai/opt/aai/logroot/
+            path: /dockerdata-nfs/onap/aai/opt/aai/logroot/
         - name: aai-config
           hostPath:
-            path: /dockerdata-nfs/onapdemo/aai/aai-config/
+            path: /dockerdata-nfs/onap/aai/aai-config/
         - name: aai-data
           hostPath:
-            path: /dockerdata-nfs/onapdemo/aai/aai-data/
+            path: /dockerdata-nfs/onap/aai/aai-data/
       restartPolicy: Always
       imagePullSecrets:
       - name: onap-docker-registry-key