Skip to content

Rename secrets_vault to vault #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronenh merged 1 commit into from
Feb 26, 2025
Merged

Rename secrets_vault to vault #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/controller/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/" }}
Expand Down
16 changes: 7 additions & 9 deletions charts/controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/controller/test/no-tls.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-108fc18c-amd64
tag: 0.33.13-ce1e7a05-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
2 changes: 1 addition & 1 deletion charts/controller/test/tls.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-108fc18c-amd64
tag: 0.33.13-ce1e7a05-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
2 changes: 1 addition & 1 deletion charts/controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tenants:
# writerKey: writer
# readerKey: reader

# secretsVault:
# vault:
# [Optional] Vault token
# token: ""
# [Optional] Kubernetes secret containing the vault token
Expand Down
2 changes: 1 addition & 1 deletion charts/directory/test/no-tls.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-108fc18c-amd64
tag: 0.33.13-ce1e7a05-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
2 changes: 1 addition & 1 deletion charts/directory/test/tls.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-108fc18c-amd64
tag: 0.33.13-ce1e7a05-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down