diff --git a/README.md b/README.md index 62f64419835666252c691d58d17aab3c42fa4afd..69140871fd5c37c112fb59f90bad420e2c916c2a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # nmaas -  +  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 | diff --git a/charts/nmaas/Chart.yaml b/charts/nmaas/Chart.yaml index 77b1650b7c022c15709dba6a5659f3962fea4a37..7786052c85eb3e893becd08416c7cc4d32507aa1 100644 --- a/charts/nmaas/Chart.yaml +++ b/charts/nmaas/Chart.yaml @@ -1,7 +1,7 @@ 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 diff --git a/charts/nmaas/templates/nmaas-platform-deployment.yaml b/charts/nmaas/templates/nmaas-platform-deployment.yaml index 46a6d347c5d26311bec97795674419d380d5a355..b0f049a8f634dd6e4fd6c7cb73682d63c901b4bb 100644 --- a/charts/nmaas/templates/nmaas-platform-deployment.yaml +++ b/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 diff --git a/charts/nmaas/values.yaml b/charts/nmaas/values.yaml index ddeb3cfe3a517800dbc970ba43e5dc0110740f46..8358a37c89d095c2d5219d6a29a959edbbf9cb2f 100644 --- a/charts/nmaas/values.yaml +++ b/charts/nmaas/values.yaml @@ -87,6 +87,7 @@ platform: properties: maintenance: false testInstance: false + environment: prod defaultLanguage: en serviceDeploymentCheckInterval: 10 serviceDeploymentCheckTimeout: 600