Merge branch '18-helm-chart-update-for-application-release-1-6-3' into 'master'

Resolve "Helm chart update for application release 1.6.3"

Closes #18

See merge request !6

README.md

 # nmaas
 
-![Version: 1.2.11](https://img.shields.io/badge/Version-1.2.11-informational?style=flat-square) ![AppVersion: 1.6.2](https://img.shields.io/badge/AppVersion-1.6.2-informational?style=flat-square)
+![Version: 1.2.12-1](https://img.shields.io/badge/Version-1.2.12--1-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square)
 
 GÉANT Network Management as a Service Helm chart for Kubernetes
 
@@ -67,12 +67,12 @@ GÉANT Network Management as a Service Helm chart for Kubernetes
 | platform.enabled | bool | `true` |  |
 | platform.image.pullPolicy | string | `"IfNotPresent"` |  |
 | platform.image.repository | string | `"artifactory.software.geant.org/nmaas-docker-local/nmaas-platform"` |  |
-| platform.image.tag | string | `"1.6.2"` |  |
+| platform.image.tag | string | `"1.6.3"` |  |
 | platform.ingress.className | string | `""` | defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set |
 | platform.initscripts.enabled | bool | `true` |  |
 | platform.initscripts.image.pullPolicy | string | `"Always"` |  |
 | platform.initscripts.image.repository | string | `"artifactory.software.geant.org/nmaas-docker-local/nmaas-platform-populate"` |  |
-| platform.initscripts.image.tag | string | `"v1.5.4"` |  |
+| platform.initscripts.image.tag | string | `"1.6.3"` |  |
 | platform.livenessProbe.failureThreshold | int | `10` |  |
 | platform.livenessProbe.httpGet.path | string | `"/actuator/health"` |  |
 | platform.livenessProbe.httpGet.port | int | `9001` |  |
@@ -153,13 +153,14 @@ GÉANT Network Management as a Service Helm chart for Kubernetes
 | portal.enabled | bool | `true` |  |
 | portal.image.pullPolicy | string | `"IfNotPresent"` |  |
 | portal.image.repository | string | `"artifactory.software.geant.org/nmaas-docker-local/nmaas-portal"` |  |
-| portal.image.tag | string | `"1.6.2"` |  |
+| portal.image.tag | string | `"1.6.3"` |  |
 | portal.ingress.className | string | `""` | defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set |
 | portal.name | string | `"nmaas-portal"` |  |
 | portal.port | int | `9009` |  |
 | portal.properties.captchaKey.literal | string | `""` | empty to use existing secret specified below |
 | portal.properties.captchaKey.secret.key | string | `"secret"` |  |
 | portal.properties.captchaKey.secret.name | string | `"nmaas-captcha-key-secret"` |  |
+| portal.properties.landingPageFlavor | string | `"VLAB"` | customizes the layout of the landing page according to chosen use-case scenario. Possible values are VLAB and VNOC |
 | portal.properties.tokenName | string | `"token"` |  |
 | portal.targetPort | int | `9009` |  |
 | portal.tls | bool | `true` |  |

charts/nmaas/Chart.yaml

 apiVersion: v2
 name: nmaas
 description: GÉANT Network Management as a Service Helm chart for Kubernetes
-version: 1.2.11
-appVersion: 1.6.2
+version: 1.2.12-1
+appVersion: 1.6.3
 keywords:
   - Network Management
   - Cloud Deployment

charts/nmaas/templates/nmaas-portal-deployment.yaml

@@ -37,6 +37,8 @@ spec:
           {{- end }}
           - name: TOKEN_NAME
             value: {{ .Values.portal.properties.tokenName }}
+          - name: LANDING_PAGE
+            value: {{ .Values.portal.properties.landingPageFlavor | quote }}
           {{- if not .Values.global.demoDeployment }}
           - name: CAPTCHA_KEY
             valueFrom:

charts/nmaas/values.yaml

@@ -58,7 +58,7 @@ platform:
     timeoutSeconds: 10
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform
-    tag: "1.6.2"
+    tag: "1.6.3"
     pullPolicy: IfNotPresent
   port: 9001
   targetPort: 9001
@@ -82,7 +82,7 @@ platform:
     enabled: true
     image:
       repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform-populate
-      tag: "v1.5.4"
+      tag: "1.6.3"
       pullPolicy: Always
   properties:
     maintenance: false
@@ -186,7 +186,7 @@ portal:
   name: nmaas-portal
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-portal
-    tag: "1.6.2"
+    tag: "1.6.3"
     pullPolicy: IfNotPresent
   ingress:
     # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
@@ -197,6 +197,8 @@ portal:
   tls: true
   properties:
     tokenName: token
+    # -- customizes the layout of the landing page according to chosen use-case scenario. Possible values are VLAB and VNOC
+    landingPageFlavor: "VLAB"
     captchaKey:
       # -- empty to use existing secret specified below
       literal: ""