Merge branch '23-alfa-version-of-the-helm-chart-for-version-1-7-0' of...

Merge branch '23-alfa-version-of-the-helm-chart-for-version-1-7-0' of gitlab.software.geant.org:nmaas/nmaas-chart into 23-alfa-version-of-the-helm-chart-for-version-1-7-0

README.md

 # nmaas
 
-![Version: 1.3.0-alpha.2](https://img.shields.io/badge/Version-1.3.0--alpha.2-informational?style=flat-square) ![AppVersion: 1.7.0-alfa](https://img.shields.io/badge/AppVersion-1.7.0--alfa-informational?style=flat-square)
+![Version: 1.3.0-alpha.4](https://img.shields.io/badge/Version-1.3.0--alpha.4-informational?style=flat-square) ![AppVersion: 1.7.0-alfa](https://img.shields.io/badge/AppVersion-1.7.0--alfa-informational?style=flat-square)
 
 GÉANT Network Management as a Service Helm chart for Kubernetes
 
@@ -93,6 +93,7 @@ GÉANT Network Management as a Service Helm chart for Kubernetes
 | platform.properties.captchaSecret.secret.key | string | `"secret"` |  |
 | platform.properties.captchaSecret.secret.name | string | `"nmaas-captcha-secret-secret"` |  |
 | platform.properties.defaultLanguage | string | `"en"` |  |
+| platform.properties.environment | string | `"prod"` |  |
 | platform.properties.helm.address | string | `"nmaas-helm"` |  |
 | platform.properties.helm.asyncUpdateCron | string | `"0 0 * * * ?"` |  |
 | platform.properties.helm.asyncUpdateEnabled | bool | `true` |  |
@@ -104,10 +105,10 @@ GÉANT Network Management as a Service Helm chart for Kubernetes
 | platform.properties.helm.username | string | `"helm"` |  |
 | platform.properties.helm.version | string | `"v3"` |  |
 | platform.properties.jwt.resetKey.literal | string | `""` | leave empty to use existing secret |
-| platform.properties.jwt.resetKey.secret.key | string | `nil` |  |
+| platform.properties.jwt.resetKey.secret.key | string | `"jwtResetKey"` |  |
 | platform.properties.jwt.secretName | string | `"nmaas-jwt"` |  |
 | platform.properties.jwt.signingKey.literal | string | `""` | leave empty to use existing secret |
-| platform.properties.jwt.signingKey.secret.key | string | `nil` |  |
+| platform.properties.jwt.signingKey.secret.key | string | `"jwtSigningKey"` |  |
 | platform.properties.k8s.deployment.defaultNamespace | string | `"default"` | parameter used only if USE_DEFAULT_NAMESPACE option is set |
 | platform.properties.k8s.deployment.defaultStorageClass | string | `nil` | should be left blank if default storage class was defined defined at cluster should be used |
 | platform.properties.k8s.deployment.namespaceConfigOption | string | `"USE_DOMAIN_NAMESPACE"` | two options possible: USE_DOMAIN_NAMESPACE or USE_DEFAULT_NAMESPACE |

charts/nmaas/Chart.yaml

 apiVersion: v2
 name: nmaas
 description: GÉANT Network Management as a Service Helm chart for Kubernetes
-version: 1.3.0-alpha.3
+version: 1.3.0-alpha.4
 appVersion: 1.7.0-alfa
 keywords:
   - Network Management

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

@@ -56,6 +56,8 @@ spec:
         - name: helm-access-key
           mountPath: /nmaas/.ssh
         env:
+          - name: ENVIRONMENT
+            value: "{{ .Values.platform.properties.environment }}"
           {{- if .Values.postgresql.install }}
           - name: POSTGRESQL_HOST
             value: {{ .Release.Name }}-postgresql

charts/nmaas/values.yaml

@@ -87,6 +87,7 @@ platform:
   properties:
     maintenance: false
     testInstance: false
+    environment: prod
     defaultLanguage: en
     serviceDeploymentCheckInterval: 10
     serviceDeploymentCheckTimeout: 600