From 1d6e5826eac0ad7c86379b9fcd8ead53bc5a42a9 Mon Sep 17 00:00:00 2001 From: Ronen Hilewicz Date: Wed, 26 Feb 2025 09:55:06 -0500 Subject: [PATCH] Rename `secrets_vault` to `vault` The directory already uses `vault` in its config and this commit applies the same change to the controller chart. --- charts/controller/templates/config.yaml | 4 ++-- charts/controller/templates/deployment.yaml | 16 +++++++--------- charts/controller/test/no-tls.values.yaml | 2 +- charts/controller/test/tls.values.yaml | 2 +- charts/controller/values.yaml | 2 +- charts/directory/test/no-tls.values.yaml | 2 +- charts/directory/test/tls.values.yaml | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/charts/controller/templates/config.yaml b/charts/controller/templates/config.yaml index 8093b7c..e3d6722 100644 --- a/charts/controller/templates/config.yaml +++ b/charts/controller/templates/config.yaml @@ -157,8 +157,8 @@ stringData: oidc: true {{- end }} - {{- with .Values.secretsVault }} - secrets_vault: + {{- with .Values.vault }} + vault: address: {{ .address }} insecure: {{ .insecure | default false }} root_path: {{ .rootPath | default "/" }} diff --git a/charts/controller/templates/deployment.yaml b/charts/controller/templates/deployment.yaml index c91449e..7d40512 100644 --- a/charts/controller/templates/deployment.yaml +++ b/charts/controller/templates/deployment.yaml @@ -128,20 +128,18 @@ spec: key: password {{- end }} - {{- if .Values.secretsVault }} - {{- if .Values.secretsVault.token }} - - name: DIRECTORY_SECRETS_VAULT_TOKEN - value: {{ .Values.secretsVault.token }} - {{- else -}} - {{- with .Values.secretsVault.tokenSecret }} - - name: DIRECTORY_SECRETS_VAULT_TOKEN + {{- with (.Values.vault).token }} + - name: DIRECTORY_VAULT_TOKEN + value: {{ . }} + {{- else -}} + {{- with (.Values.vault).tokenSecret }} + - name: DIRECTORY_VAULT_TOKEN valueFrom: secretKeyRef: name: {{ .name }} key: {{ .key }} {{- end }} - {{- end }} - {{- end }} + {{- end }} {{- range $_, $tenant := .Values.tenants -}} {{- with $tenant.keysSecret }} diff --git a/charts/controller/test/no-tls.values.yaml b/charts/controller/test/no-tls.values.yaml index a216ad5..aa657e0 100644 --- a/charts/controller/test/no-tls.values.yaml +++ b/charts/controller/test/no-tls.values.yaml @@ -1,6 +1,6 @@ --- image: - tag: 0.33.11-108fc18c-amd64 + tag: 0.33.13-ce1e7a05-amd64 imagePullSecrets: - name: ghcr-creds diff --git a/charts/controller/test/tls.values.yaml b/charts/controller/test/tls.values.yaml index 3f937b4..304bae0 100644 --- a/charts/controller/test/tls.values.yaml +++ b/charts/controller/test/tls.values.yaml @@ -1,6 +1,6 @@ --- image: - tag: 0.33.11-108fc18c-amd64 + tag: 0.33.13-ce1e7a05-amd64 imagePullSecrets: - name: ghcr-creds diff --git a/charts/controller/values.yaml b/charts/controller/values.yaml index 06ac3f0..eb3de4d 100644 --- a/charts/controller/values.yaml +++ b/charts/controller/values.yaml @@ -71,7 +71,7 @@ tenants: # writerKey: writer # readerKey: reader -# secretsVault: +# vault: # [Optional] Vault token # token: "" # [Optional] Kubernetes secret containing the vault token diff --git a/charts/directory/test/no-tls.values.yaml b/charts/directory/test/no-tls.values.yaml index 3bd9134..5627b0f 100644 --- a/charts/directory/test/no-tls.values.yaml +++ b/charts/directory/test/no-tls.values.yaml @@ -1,6 +1,6 @@ --- image: - tag: 0.33.11-108fc18c-amd64 + tag: 0.33.13-ce1e7a05-amd64 imagePullSecrets: - name: ghcr-creds diff --git a/charts/directory/test/tls.values.yaml b/charts/directory/test/tls.values.yaml index c486c10..d40b022 100644 --- a/charts/directory/test/tls.values.yaml +++ b/charts/directory/test/tls.values.yaml @@ -1,6 +1,6 @@ --- image: - tag: 0.33.11-108fc18c-amd64 + tag: 0.33.13-ce1e7a05-amd64 imagePullSecrets: - name: ghcr-creds