DevOps/helm-pixelfed
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

clean up valkey secret to allow only sourcing one or two secret keys at a time

Browse Source
This commit is contained in:
jessebot
2025-01-19 11:07:52 +01:00
parent 68260d4af5
commit 4b3b44ddbf
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/pixelfed/templates/deployment.yaml
+22 -7
View File
@@ -48,27 +48,42 @@ spec:
- configMapRef: - configMapRef:
name: {{ include "pixelfed.fullname" . }}-env name: {{ include "pixelfed.fullname" . }}-env
env: env:
# redis # valkey AKA redis
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecretKeys.host }}
- name: REDIS_HOST - name: REDIS_HOST
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
name: {{ .Values.externalValkey.existingSecret }} name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.host }} key: {{ .Values.externalValkey.existingSecretKeys.host }}
{{- else }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: host
{{- end }} {{- end }}
{{- end }}
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }} {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
- name: REDIS_PORT - name: REDIS_PORT
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
name: {{ .Values.externalValkey.existingSecret }} name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.port }} key: {{ .Values.externalValkey.existingSecretKeys.port }}
{{- else }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: port
{{- end }} {{- end }}
{{- end }}
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if .Values.externalValkey.existingSecret }} {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret }}
name: {{ .Values.externalValkey.existingSecret }} name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.password }} key: {{ .Values.externalValkey.existingSecretKeys.password }}
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: password
{{- else if .Values.valkey.auth.existingSecret }} {{- else if .Values.valkey.auth.existingSecret }}
name: {{ .Values.valkey.auth.existingSecret }} name: {{ .Values.valkey.auth.existingSecret }}
key: password key: password
@@ -85,7 +100,7 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }} name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.host }} key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
{{- else }} {{- else }}
name: pixelfed-mail name: {{ include "pixelfed.fullname" . }}-mail
key: host key: host
{{- end }} {{- end }}
- name: MAIL_PORT - name: MAIL_PORT
@@ -95,7 +110,7 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }} name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.port }} key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
{{- else }} {{- else }}
name: pixelfed-mail name: {{ include "pixelfed.fullname" . }}-mail
key: port key: port
{{- end }} {{- end }}
- name: MAIL_USERNAME - name: MAIL_USERNAME
@@ -105,7 +120,7 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }} name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.username }} key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
{{- else }} {{- else }}
name: pixelfed-mail name: {{ include "pixelfed.fullname" . }}-mail
key: username key: username
{{- end }} {{- end }}
- name: MAIL_PASSWORD - name: MAIL_PASSWORD
@@ -115,7 +130,7 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }} name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.password }} key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
{{- else }} {{- else }}
name: pixelfed-mail name: {{ include "pixelfed.fullname" . }}-mail
key: password key: password
{{- end }} {{- end }}
charts/pixelfed/templates/secret_valkey.yaml
+7 -1
View File
@@ -1,11 +1,17 @@
{{- if and .Values.externalValkey.enabled ( not .Values.externalValkey.existingSecret ) }} {{- if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (or .Values.externalValkey.existingSecretKeys.password .Values.externalValkey.existingSecretKeys.port .Values.externalValkey.existingSecretKeys.host ) }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "pixelfed.fullname" . }}-valkey name: {{ include "pixelfed.fullname" . }}-valkey
data: data:
{{- if not .Values.externalValkey.existingSecretKeys.host }}
host: {{ .Values.externalValkey.host | b64enc }} host: {{ .Values.externalValkey.host | b64enc }}
{{- end }}
{{- if not .Values.externalValkey.existingSecretKeys.port }}
port: {{ .Values.externalValkey.port | quote | b64enc }} port: {{ .Values.externalValkey.port | quote | b64enc }}
{{- end }}
{{- if not .Values.externalValkey.existingSecretKeys.password }}
password: {{ .Values.externalValkey.password | b64enc }} password: {{ .Values.externalValkey.password | b64enc }}
{{- end }} {{- end }}
{{- end }}