From b408d53cb7bb1b2df5b4ce3616e143db953f896f Mon Sep 17 00:00:00 2001 From: Daniel S Date: Mon, 24 Jun 2024 09:33:20 +0200 Subject: [PATCH] chore(helm): make capsule configuration name configurable via helm (#1103) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(helm): capsuleconfiguration name configurable Signed-off-by: Daniel S. * feat(helm): capsuleconfiguration name configurable Signed-off-by: Daniel S. * ci(gosec): fix sarif upload Signed-off-by: Oliver Bähler * feat(helm): capsuleconfiguration name configurable Signed-off-by: Daniel S. --------- Signed-off-by: Daniel S. Signed-off-by: Oliver Bähler Co-authored-by: Oliver Bähler --- charts/capsule/README.md | 1 + charts/capsule/templates/daemonset.yaml | 2 +- charts/capsule/templates/deployment.yaml | 2 +- charts/capsule/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/capsule/README.md b/charts/capsule/README.md index dd6fe95f..f39e38f5 100644 --- a/charts/capsule/README.md +++ b/charts/capsule/README.md @@ -144,6 +144,7 @@ Here the values you can override: | manager.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | manager.kind | string | `"Deployment"` | Set the controller deployment mode as `Deployment` or `DaemonSet`. | | manager.livenessProbe | object | `{"httpGet":{"path":"/healthz","port":10080}}` | Configure the liveness probe using Deployment probe spec | +| manager.options.capsuleConfiguration | string | `"default"` | Change the default name of the capsule configuration name | | manager.options.capsuleUserGroups | list | `["projectcapsule.dev"]` | Override the Capsule user groups | | manager.options.forceTenantPrefix | bool | `false` | Boolean, enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix, separated by a dash | | manager.options.generateCertificates | bool | `true` | Specifies whether capsule webhooks certificates should be generated by capsule operator | diff --git a/charts/capsule/templates/daemonset.yaml b/charts/capsule/templates/daemonset.yaml index 2b515744..4f8a6077 100644 --- a/charts/capsule/templates/daemonset.yaml +++ b/charts/capsule/templates/daemonset.yaml @@ -64,7 +64,7 @@ spec: - --webhook-port={{ .Values.manager.webhookPort }} - --enable-leader-election - --zap-log-level={{ default 4 .Values.manager.options.logLevel }} - - --configuration-name=default + - --configuration-name={{ .Values.manager.options.capsuleConfiguration }} image: {{ include "capsule.managerFullyQualifiedDockerImage" . }} imagePullPolicy: {{ .Values.manager.image.pullPolicy }} env: diff --git a/charts/capsule/templates/deployment.yaml b/charts/capsule/templates/deployment.yaml index 2e2e3eb8..60a2e4c1 100644 --- a/charts/capsule/templates/deployment.yaml +++ b/charts/capsule/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: - --webhook-port={{ .Values.manager.webhookPort }} - --enable-leader-election - --zap-log-level={{ default 4 .Values.manager.options.logLevel }} - - --configuration-name=default + - --configuration-name={{ .Values.manager.options.capsuleConfiguration }} image: {{ include "capsule.managerFullyQualifiedDockerImage" . }} imagePullPolicy: {{ .Values.manager.image.pullPolicy }} env: diff --git a/charts/capsule/values.yaml b/charts/capsule/values.yaml index 2d80489e..5d486395 100644 --- a/charts/capsule/values.yaml +++ b/charts/capsule/values.yaml @@ -70,6 +70,8 @@ manager: # Additional Capsule Controller Options options: + # -- Change the default name of the capsule configuration name + capsuleConfiguration: default # -- Set the log verbosity of the capsule with a value from 1 to 10 logLevel: '4' # -- Boolean, enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix, separated by a dash