portal K8S-Helm Parameterization

changed portal k8s deployment to support helm parameterization
Issue-ID: OOM-52
Change-Id: I8ad9681b597a87113089f194e1a0e8a9e550bb08
Signed-off-by: kerenj <keren.joseph@amdocs.com>

diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index 9b4de9d..dd6b22d 100644 (file)
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot')
-ONAP_APPS=('sdc' 'aai' 'portal' 'policy' 'appc')
+HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal')
+ONAP_APPS=('sdc' 'aai' 'policy' 'appc')
 ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key}
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}

diff --git a/kubernetes/portal/.helmignore b/kubernetes/portal/.helmignore
new file mode 100644 (file)
index 0000000..dd5be16
--- /dev/null
+++ b/kubernetes/portal/.helmignore
@@ -0,0 +1,6 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+
+# docker folder
+docker/

diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
new file mode 100644 (file)
index 0000000..706a4f4
--- /dev/null
+++ b/kubernetes/portal/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: portal
+version: 0.1.0

diff --git a/kubernetes/portal/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
similarity index 89%
rename from kubernetes/portal/all-services.yaml
rename to kubernetes/portal/templates/all-services.yaml
index 0cb5947..488fb80 100644 (file)
--- a/kubernetes/portal/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: portaldb
+  namespace: {{ .Values.NS }}
   labels:
     app: portaldb
 spec:
@@ -18,6 +19,7 @@ metadata:
   labels:
     app: portalapps
   name: portalapps
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: portal-1
@@ -42,6 +44,7 @@ metadata:
   labels:
     app: vnc-portal
   name: vnc-portal
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: tcp-1
@@ -60,6 +63,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: portalwidgets
+  namespace: {{ .Values.NS }}
   labels:
     app: portalwidgets
 spec:

diff --git a/kubernetes/portal/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
similarity index 73%
rename from kubernetes/portal/portal-apps-deployment.yaml
rename to kubernetes/portal/templates/portal-apps-deployment.yaml
index c9ed3e7..23a6459 100755 (executable)
--- a/kubernetes/portal/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: portalapps
+  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": "portalapps-readiness"
            },
            {
@@ -48,14 +49,15 @@ spec:
                    "name": "portal-root"
                  }
                ],
-               "image": "oomk8s/mariadb-client-init:1.0.0",
-               "imagePullPolicy": "Always",
+               "image": "{{ .Values.image.mariadbClient }}",
+               "imagePullPolicy": "{{ .Values.pullPolicy }}",
                "name": "provision-portaldb-users"
            }
            ]'
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
+      - image: {{ .Values.image.portalapps }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         lifecycle:
           postStart:
             exec:
@@ -100,45 +102,45 @@ spec:
       volumes:
         - name: portal-fusion-properties
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
+            path:  /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
         - name: portal-openid-connect-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
         - name: portal-system-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
         - name: portal-portal-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
         - name: dbcapp-fusion-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
         - name: dbcapp-system-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
         - name: dbcapp-portal-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
         - name: dbcapp-dbcapp-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
         - name: sdkapp-system-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
         - name: sdkapp-portal-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
         - name: sdkapp-fusion-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties            
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties            
         - name: portal-mariadb-onboarding-sql
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/mariadb/oom_updates.sql
+            path: /dockerdata-nfs/onap/portal/mariadb/oom_updates.sql
         - name: portal-root
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal
+            path: /dockerdata-nfs/onap/portal
         - name: portal-logs
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/logs
+            path: /dockerdata-nfs/onap/portal/logs
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/portal/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
similarity index 82%
rename from kubernetes/portal/portal-mariadb-deployment.yaml
rename to kubernetes/portal/templates/portal-mariadb-deployment.yaml
index 42481fd..cf8bbd6 100755 (executable)
--- a/kubernetes/portal/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: portaldb
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -13,7 +14,8 @@ spec:
       name: portaldb
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/portaldb:1.1-STAGING-latest
+      - image: {{ .Values.image.portaldb}} 
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: "portaldb"
         env:
         - name: MYSQL_HOST
@@ -34,6 +36,6 @@ spec:
       volumes:
       - name: portal-mariadb-data
         hostPath:
-          path: /dockerdata-nfs/onapdemo/portal/mariadb/data
+          path: /dockerdata-nfs/onap/portal/mariadb/data
       imagePullSecrets:
       - name: onap-docker-registry-key

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:

diff --git a/kubernetes/portal/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
similarity index 80%
rename from kubernetes/portal/portal-widgets-deployment.yaml
rename to kubernetes/portal/templates/portal-widgets-deployment.yaml
index e170313..0aea756 100644 (file)
--- a/kubernetes/portal/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: portalwidgets
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -32,14 +33,15 @@ spec:
                        }
                    }
                ],
-               "image": "oomk8s/readiness-check:1.0.0",
-               "imagePullPolicy": "Always",
+               "image": "{{ .Values.image.readiness }}",
+               "imagePullPolicy": "{{ .Values.pullPolicy }}",
                "name": "portalapps-readiness"
            }
            ]'
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest
+      - image: {{ .Values.image.portalwms }}
+        imagePullPolicy: {{ .Values.pullPolicy }} 
         name: portalwidgets
         volumeMounts:
         - mountPath: /application.properties
@@ -54,4 +56,4 @@ spec:
       volumes:
         - name: portalwidgets-application-properties
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
+            path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
new file mode 100644 (file)
index 0000000..b88b644
--- /dev/null
+++ b/kubernetes/portal/values.yaml
@@ -0,0 +1,10 @@
+NS: onap-portal
+pullPolicy: Always
+image:
+  readiness: oomk8s/readiness-check:1.0.0
+  portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
+  portaldb: nexus3.onap.org:10001/openecomp/portaldb:1.1-STAGING-latest
+  mariadbClient: oomk8s/mariadb-client-init:1.0.0
+  portalwms: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest
+  ubuntuInit: oomk8s/ubuntu-init:1.0.0
+  ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc