fix: thread secret annotations and labels through new helm charts
The new config and pull secret helm releases need to honor user-set annotations and labels for `--resource-type secret` so existing scheduler-k3s annotation tests keep passing. The dedicated charts now render `.Values.global.annotations` and `.Values.global.labels` onto their Secret manifest, and the deploy trigger plumbs `SecretAnnotations` and `SecretLabels` from the global annotation/label config. The rollback regression bats test now uses `dokku ps:rebuild` for its second deploy because git push of an unchanged ref is rejected by the dokku remote.
This commit is contained in:
6 files changed
+69
-16
No files matched your search
@@ -6,8 +6,14 @@ metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: config-{{ .Values.global.app_name }}
|
||||
app.kubernetes.io/part-of: {{ .Values.global.app_name }}
|
||||
{{- range $k, $v := .Values.global.labels }}
|
||||
{{ $k }}: {{ $v | quote }}
|
||||
{{- end }}
|
||||
annotations:
|
||||
dokku.com/managed: "true"
|
||||
{{- range $k, $v := .Values.global.annotations }}
|
||||
{{ $k }}: {{ $v | quote }}
|
||||
{{- end }}
|
||||
{{- with .Values.global.secrets }}
|
||||
data:
|
||||
{{- toYaml . | nindent 2 }}
|
||||
|
||||
@@ -7,7 +7,13 @@ metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: pull-secret-{{ .Values.global.app_name }}
|
||||
app.kubernetes.io/part-of: {{ .Values.global.app_name }}
|
||||
{{- range $k, $v := .Values.global.labels }}
|
||||
{{ $k }}: {{ $v | quote }}
|
||||
{{- end }}
|
||||
annotations:
|
||||
dokku.com/managed: "true"
|
||||
{{- range $k, $v := .Values.global.annotations }}
|
||||
{{ $k }}: {{ $v | quote }}
|
||||
{{- end }}
|
||||
data:
|
||||
.dockerconfigjson: {{ .Values.global.pull_secret_base64 | quote }}
|
||||
Reference in new issue
Block a user