diff --git a/README.md b/README.md index 8646804b0d72382fb77232d2726ee0d32452fc00..1c8d69243d00832ce6a0bb8f9f4597a61753d0cf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # nmaas -  +  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` | | diff --git a/charts/nmaas/Chart.yaml b/charts/nmaas/Chart.yaml index 25a229d4bec33007abd3d1ee01c1b1627c5ea15e..903325edc49d20e2734eb92cd733e1428e1737f0 100644 --- a/charts/nmaas/Chart.yaml +++ b/charts/nmaas/Chart.yaml @@ -1,8 +1,8 @@ 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 diff --git a/charts/nmaas/templates/nmaas-portal-deployment.yaml b/charts/nmaas/templates/nmaas-portal-deployment.yaml index 64dd93394bc980aca38ca6b544d3c6e2a2107876..781f7c00d53da2984251d1d3cea5779ddfc5a41d 100644 --- a/charts/nmaas/templates/nmaas-portal-deployment.yaml +++ b/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: diff --git a/charts/nmaas/values.yaml b/charts/nmaas/values.yaml index e2f7fe34a0521873b8421c1fe38907fbd4a14f01..94c9e0161ad9a90bce9150ed3a2472916581f563 100644 --- a/charts/nmaas/values.yaml +++ b/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: ""