Skip to content
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

Jump to bottom

Use existing betydb password secret #5

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

Use existing betydb password secret #5

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
b5cd44f
Use existing betydb password secret
Sagar2366 Sep 11, 2022
218f323
Use existing betydb password secret
Sagar2366 Sep 11, 2022
fb96a86
Adding changes to use existing encryption key
Sagar2366 Sep 19, 2022
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
55 changes: 50 additions & 5 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,56 @@ postgresql Port
{{- end -}}
{{- end -}}

{{/*
Get the betydb secret.
*/}}
{{- define "betydb.secretName" -}}
{{- if .Values.auth.existingSecret -}}
{{- printf "%s" (tpl .Values.auth.existingSecret $) -}}
{{- else -}}
{{- printf "%s" (include "betydb.fullname" .) -}}
{{- end -}}
{{- end -}}

{{/*
Get the betyPassword key.
*/}}
{{- define "betyPassword" -}}
{{- if .Values.auth.existingSecret }}
{{- if .Values.auth.secretKeys.betyPassword }}
{{- printf "%s" (tpl .Values.auth.secretKeys.betyPassword $) -}}
{{- else -}}
{{ .Values.betyPassword | b64enc | quote }}
{{- end -}}
{{- else -}}
{{ .Values.betyPassword | b64enc | quote }}
{{- end -}}
{{- end -}}

{{/*
Get the betydb encryption secret key.
*/}}
{{- define "betydb.betydbEncryptionSecretKey" -}}
{{- if .Values.auth.existingSecret }}
{{- if .Values.auth.secretKeys.betydbEncryptionKey }}
{{- printf "%s" (tpl .Values.auth.secretKeys.betydbEncryptionKey $) -}}
{{- else -}}
{{- "secretKey" }}
{{- end -}}
{{- else -}}
{{- "secretKey" }}
{{- end -}}
{{- end -}}

{{/*
Return true if a betydb secret object should be created
*/}}
{{- define "betydb.createSecret" -}}
{{- if not (.Values.auth.existingSecret) -}}
{{- true -}}
{{- end -}}
{{- end -}}

{{/*
Environment variables for PostgreSQL
*/}}
Expand Down Expand Up @@ -94,11 +144,6 @@ Environment variables for BetyDB
{{- define "betydb.betydbEnv" -}}
- name: BETYUSER
value: {{ .Values.betyUser | quote }}
- name: BETYPASSWORD
valueFrom:
secretKeyRef:
name: {{ include "betydb.fullname" . }}
key: betyPassword
- name: BETYDATABASE
value: {{ .Values.betyDatabase | quote }}
- name: LOCAL_SERVER
Expand Down
9 changes: 7 additions & 2 deletions templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,17 @@ spec:
- name: SECRET_KEY_BASE
valueFrom:
secretKeyRef:
name: {{ include "betydb.fullname" . }}
key: secretKey
name: {{ include "betydb.secretName" . }}
key: {{ include "betydb.betydbEncryptionSecretKey" . }}
- name: RAILS_RELATIVE_URL_ROOT
value: {{ .Values.ingress.path | default "" | trimSuffix "/" | quote }}
- name: RAILS_LOG_TO_STDOUT
value: "true"
- name: BETYPASSWORD
valueFrom:
secretKeyRef:
name: {{ include "betydb.secretName" . }}
key: {{ include "betydb.betydbPasswordKey" . }}
{{- include "betydb.postgresqlEnv" . | nindent 12 }}
{{- include "betydb.betydbEnv" . | nindent 12 }}
{{- if .Values.customization }}
Expand Down
5 changes: 5 additions & 0 deletions templates/hooks/add-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ spec:
- {{ .data | quote }}
- {{ .page | quote }}
env:
- name: BETYPASSWORD
valueFrom:
secretKeyRef:
name: {{ include "betydb.secretName" . }}
key: {{ include "betydb.betydbPasswordKey" . }}
{{- $pgenv | nindent 12 }}
{{- $betyenv | nindent 12 }}
{{- end }}
Expand Down
5 changes: 5 additions & 0 deletions templates/hooks/load-db.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ spec:
imagePullPolicy: Always
{{- end }}
env:
- name: BETYPASSWORD
valueFrom:
secretKeyRef:
name: {{ include "betydb.secretName" . }}
key: {{ include "betydb.betydbPasswordKey" . }}
{{- include "betydb.postgresqlEnv" . | nindent 12 }}
{{- include "betydb.betydbEnv" . | nindent 12 }}
{{- end }}
2 changes: 2 additions & 0 deletions templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if (include "postgresql.createSecret" .) }}
apiVersion: v1
kind: Secret
metadata:
Expand All @@ -11,3 +12,4 @@ data:
{{- end }}
betyPassword: {{ .Values.betyPassword | b64enc | quote }}
secretKey: {{ .Values.secretKey | b64enc | quote }}
{{- end }}
9 changes: 9 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,12 @@ affinity: {}
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
hooks:
affinity: {}


## Use existing bety password as secret
## Create secret pecan-betydb-old with key betyPassword
auth:
existingSecret: ""
secretKeys:
betydbPasswordKey: ""
betydbEncryptSecretKey: ""