Skip to content

do not create secrets if loaded from file #113

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

do not create secrets if loaded from file #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49d3e96
do not create secrets if loaded from file
akitson-degreed Aug 4, 2023
7d7a0b5
use same syntax as in other places of repo; do not add secrets to con…
akitson-degreed Aug 4, 2023
9f59438
ensure deployment_jobs.yaml has the updates for the file secrets
akitson-degreed Aug 4, 2023
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
10 changes: 10 additions & 0 deletions charts/retool/templates/deployment_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ spec:
- name: POSTGRES_SSL_ENABLED
value: {{ template "retool.postgresql.ssl_enabled" . }}
{{- if and (not .Values.externalSecrets.enabled) (not .Values.externalSecrets.externalSecretsOperator.enabled) }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.LICENSE_KEY_FILE) }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand All @@ -88,6 +89,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: license-key
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.JWT_SECRET_FILE) }}
- name: JWT_SECRET
valueFrom:
secretKeyRef:
Expand All @@ -98,6 +101,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: jwt-secret
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.ENCRYPTION_KEY_FILE) }}
- name: ENCRYPTION_KEY
valueFrom:
secretKeyRef:
Expand All @@ -108,6 +113,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: encryption-key
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.POSTGRES_PASSWORD_FILE) }}
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
Expand All @@ -123,6 +130,8 @@ spec:
key: postgresql-password
{{- end }}
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.GOOGLE_CLIENT_SECRET_FILE) }}
- name: CLIENT_SECRET
valueFrom:
secretKeyRef:
Expand All @@ -134,6 +143,7 @@ spec:
key: google-client-secret
{{- end }}
{{- end }}
{{- end }}
{{- range $key, $value := .Values.env }}
- name: "{{ $key }}"
value: "{{ $value }}"
Expand Down
10 changes: 10 additions & 0 deletions charts/retool/templates/deployment_jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ spec:
- name: POSTGRES_SSL_ENABLED
value: {{ template "retool.postgresql.ssl_enabled" . }}
{{- if and (not .Values.externalSecrets.enabled) (not .Values.externalSecrets.externalSecretsOperator.enabled) }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.LICENSE_KEY_FILE) }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand All @@ -89,6 +90,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: license-key
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.JWT_SECRET_FILE) }}
- name: JWT_SECRET
valueFrom:
secretKeyRef:
Expand All @@ -99,6 +102,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: jwt-secret
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.ENCRYPTION_KEY_FILE) }}
- name: ENCRYPTION_KEY
valueFrom:
secretKeyRef:
Expand All @@ -109,6 +114,8 @@ spec:
name: {{ template "retool.fullname" . }}
key: encryption-key
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.POSTGRES_PASSWORD_FILE) }}
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
Expand All @@ -124,6 +131,8 @@ spec:
key: postgresql-password
{{- end }}
{{- end }}
{{- end }}
{{- if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.GOOGLE_CLIENT_SECRET_FILE) }}
- name: CLIENT_SECRET
valueFrom:
secretKeyRef:
Expand All @@ -135,6 +144,7 @@ spec:
key: google-client-secret
{{- end }}
{{- end }}
{{- end }}
{{- range $key, $value := .Values.env }}
- name: "{{ $key }}"
value: "{{ $value }}"
Expand Down
11 changes: 11 additions & 0 deletions charts/retool/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ type: Opaque
{{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName | default dict }}
{{- $secretData := (get $secret "data") | default dict }}
data:
{{ if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.LICENSE_KEY_FILE) }}
license-key: {{ .Values.config.licenseKey | default "" | b64enc | quote }}
{{ end }}


{{ if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.JWT_SECRET_FILE) }}
{{ if not .Values.config.jwtSecretSecretName }}
{{ if .Values.config.jwtSecret }}
jwt-secret: {{ .Values.config.jwtSecret | b64enc | quote }}
Expand All @@ -25,7 +29,9 @@ data:
jwt-secret: {{ randAlphaNum 20 | b64enc | quote }}
{{ end }}
{{ end }}
{{ end }}

{{ if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.ENCRYPTION_KEY_FILE) }}
{{ if not .Values.config.encryptionKeySecretName }}
{{ if .Values.config.encryptionKey }}
encryption-key: {{ .Values.config.encryptionKey | b64enc | quote }}
Expand All @@ -35,14 +41,19 @@ data:
encryption-key: {{ required "Please set a value for .Values.config.encryptionKey" .Values.config.encryptionKey }}
{{ end }}
{{ end }}
{{ end }}

{{ if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.GOOGLE_CLIENT_SECRET_FILE) }}
{{ if .Values.config.auth.google.clientSecret }}
google-client-secret: {{ .Values.config.auth.google.clientSecret | b64enc | quote }}
{{ else }}
google-client-secret: ""
{{ end }}
{{ end }}

{{ if not .Values.postgresql.enabled }}
{{ if and (not .Values.env.RETOOL_LOAD_FILE_SECRETS) (not .Values.env.POSTGRES_PASSWORD_FILE) }}
postgresql-password: {{ .Values.config.postgresql.password | default "" | b64enc | quote }}
{{ end }}
{{ end }}
{{- end }}