Skip to content

Commit

Permalink
Stop generating the checksum labels for Auth Secret when existing sec…
Browse files Browse the repository at this point in the history
…ret provided (#392)
  • Loading branch information
bmarick authored Apr 11, 2024
1 parent eb12a53 commit b278850
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Fix syntax with ensure-packs-volumes-are-writable job (#403) (by @skiedude)
* Add securityContext support to custom st2packs images, extra_hooks jobs; Also fallback to st2actionrunner securityContext for misc init container jobs and pods. (#410) (by @cognifloyd)
* Stop generating the DataStore Secret (#385) and checksum labels (#391) when existing secret provided or disabled (by @bmarick)
* Stop generating the checksum labels for Auth Secret (#392) when existing secret provided or disabled (by @bmarick)

## v1.0.0
* Bump to latest CircleCI orb versions ([email protected] and [email protected] by @ZoeLeah)
Expand Down
4 changes: 4 additions & 0 deletions templates/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ spec:
labels: {{- include "stackstorm-ha.labels" (list $ "st2auth") | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
{{- if not .Values.st2.existingAuthSecret }}
checksum/auth: {{ include (print $.Template.BasePath "/secrets_st2auth.yaml") . | sha256sum }}
{{- end }}
{{- if .Values.st2auth.postStartScript }}
checksum/post-start-script: {{ .Values.st2auth.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -1584,7 +1586,9 @@ spec:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
checksum/rbac: {{ include (print $.Template.BasePath "/configmaps_rbac.yaml") . | sha256sum }}
checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.yaml") . | sha256sum }}
{{- if not .Values.st2.existingAuthSecret }}
checksum/auth: {{ include (print $.Template.BasePath "/secrets_st2auth.yaml") . | sha256sum }}
{{- end }}
checksum/ssh: {{ include (print $.Template.BasePath "/secrets_ssh.yaml") . | sha256sum }}
{{- if and (ne "disable" (default "" .Values.st2.datastore_crypto_key)) (not .Values.st2.existingDatastoreSecret) }}
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
Expand Down

0 comments on commit b278850

Please sign in to comment.