portal K8S-Helm Parameterization

[oom.git] / kubernetes / portal / templates / portal-vnc-dep.yaml

diff --git a/kubernetes/portal/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
similarity index 84%
rename from kubernetes/portal/portal-vnc-dep.yaml
rename to kubernetes/portal/templates/portal-vnc-dep.yaml
index f475865..e4a8574 100644 (file)
--- a/kubernetes/portal/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: vnc-portal
   name: vnc-portal
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -34,8 +35,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-portal-readiness"
           },
           {
@@ -52,8 +53,8 @@ spec:
                       "value": "onap-policy"
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-pap-readiness"
           },
           {
@@ -70,8 +71,8 @@ spec:
                       "value": "onap-sdc"
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-sdc-readiness"
           },
           {
@@ -88,15 +89,15 @@ spec:
                       "value": "onap-vid"
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-vid-readiness"
           },
           {
               "command": ["/bin/sh","-c"],
               "args": ["echo `host sdc-be.onap-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host portalapps.onap-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host pap.onap-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host sdc-fe.onap-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host vid-server.onap-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.onap-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts"],
-              "image": "oomk8s/ubuntu-init:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.ubuntuInit }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-init-hosts",
               "volumeMounts": [
                 {
@@ -108,7 +109,8 @@ spec:
           ]'
     spec:
       containers:
-      - image: dorowu/ubuntu-desktop-lxde-vnc
+      - image: {{ .Values.image.ubuntuDesktop }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         lifecycle:
           postStart:
             exec: