alexlebens/helm-charts
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Releases 418 Activity

change credential handling
All checks were successful
renovate / renovate (push) Successful in 50s
Details
release-charts-generic-device-plugin / release (push) Successful in 16s
Details
release-charts-postgres-cluster / release (push) Successful in 16s
Details

Browse Source
This commit is contained in:
Alex Lebens
2025-10-02 20:46:15 -05:00
parent 049829d7ef
commit 01052fa169
5 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
charts/postgres-cluster/templates/_helpers.tpl
View File

@@ -88,16 +88,12 @@ Generate recovery server name
Generate name for recovery object store credentials
*/}}
{{- define "cluster.recoveryCredentials" -}}
{{- if .Values.recovery.endpointCredentials -}}
{{- .Values.recovery.endpointCredentials -}}
{{- else -}}
{{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
{{- end }}
{{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
{{- end }}
{{/*
Generate name for backup object store credentials
*/}}
{{- define "cluster.backupCredentials" -}}
{{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
{{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
{{- end }}

16
charts/postgres-cluster/templates/object-store.yaml
View File

@@ -37,18 +37,10 @@ spec:
{{- end }}
s3Credentials:
accessKeyId:
{{- if .endpointCredentials }}
name: {{ .endpointCredentials }}
{{- else }}
name: {{ include "cluster.backupCredentials" $context }}
{{- end }}
name: {{ .endpointCredentials | default include "cluster.backupCredentials" $context }}
key: ACCESS_KEY_ID
secretAccessKey:
{{- if .endpointCredentials }}
name: {{ .endpointCredentials }}
{{- else }}
name: {{ include "cluster.backupCredentials" $context }}
{{- end }}
name: {{ .endpointCredentials | default include "cluster.backupCredentials" $context }}
key: ACCESS_SECRET_KEY
{{ end -}}
{{ end }}
@@ -85,9 +77,9 @@ spec:
jobs: {{ .Values.recovery.objectStore.data.jobs }}
s3Credentials:
accessKeyId:
name: {{ include "cluster.recoveryCredentials" . }}
name: {{ .Values.recovery.endpointCredentials | default include "cluster.recoveryCredentials" . }}
key: ACCESS_KEY_ID
secretAccessKey:
name: {{ include "cluster.recoveryCredentials" . }}
name: {{ .Values.recovery.endpointCredentials | default include "cluster.recoveryCredentials" . }}
key: ACCESS_SECRET_KEY
{{ end }}