aai K8S-Helm Parameterization

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

diff --git a/kubernetes/aai/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
similarity index 88%
rename from kubernetes/aai/modelloader-deployment.yaml
rename to kubernetes/aai/templates/modelloader-deployment.yaml
index e649fc0..96c9ee1 100644 (file)
--- a/kubernetes/aai/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: model-loader-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": "model-loader-readiness"
           },
           {
@@ -58,8 +59,8 @@ spec:
                       "value": "onap-sdc"
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "model-loader-sdc-readiness"
           }
           ]'
@@ -82,7 +83,8 @@ spec:
           value: ModelLoader
         - name: APP_SERVER_AUTH_PASSWORD
           value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
-        image: nexus3.onap.org:10001/openecomp/model-loader:1.0-STAGING-latest
+        image: {{ .Values.image.modelLoader }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: model-loader-service
         ports:
         - containerPort: 8080