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

Remove data store key labels when not generating the secret #391

Merged
merged 6 commits into from
Apr 11, 2024
Merged

Remove data store key labels when not generating the secret #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3390cd5
Remove label from deployments for datastore key when disabled
bmarick Feb 7, 2024
0856933
fix messed up templating
bmarick Feb 7, 2024
d6c020a
Add to Change Log
bmarick Feb 7, 2024
62964b5
Update CHANGELOG.md
bmarick Feb 7, 2024
4c20f41
Merge branch 'master' into removeDataStoreKeyLabels
cognifloyd Apr 11, 2024
00ea9a5
Move changelog entry up
cognifloyd Apr 11, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Development
* 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)

## v1.0.0
* Bump to latest CircleCI orb versions (kubernetes@1.3.1 and helm@3.0.0 by @ZoeLeah)
Expand Down
14 changes: 14 additions & 0 deletions templates/deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ spec:
labels: {{- include "stackstorm-ha.labels" (list $ "st2api") | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.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 }}
{{- end }}
{{- if .Values.st2api.postStartScript }}
checksum/post-start-script: {{ .Values.st2api.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -548,7 +550,9 @@ spec:
labels: {{- include "stackstorm-ha.labels" (list $ "st2rulesengine") | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.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 }}
{{- end }}
{{- if .Values.st2rulesengine.postStartScript }}
checksum/post-start-script: {{ .Values.st2rulesengine.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -769,7 +773,9 @@ spec:
labels: {{- include "stackstorm-ha.labels" (list $ "st2workflowengine") | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.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 }}
{{- end }}
{{- if .Values.st2workflowengine.postStartScript }}
checksum/post-start-script: {{ .Values.st2workflowengine.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -886,7 +892,9 @@ spec:
labels: {{- include "stackstorm-ha.labels" (list $ "st2scheduler") | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.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 }}
{{- end }}
{{- if .Values.st2scheduler.postStartScript }}
checksum/post-start-script: {{ .Values.st2scheduler.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -1137,7 +1145,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") $ | sha256sum }}
checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.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 }}
{{- end }}
{{- if $.Values.st2sensorcontainer.postStartScript }}
checksum/post-start-script: {{ $.Values.st2sensorcontainer.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -1318,7 +1328,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
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 }}
{{- end }}
{{- if .Values.st2actionrunner.postStartScript }}
checksum/post-start-script: {{ .Values.st2actionrunner.postStartScript | sha256sum }}
{{- end }}
Expand Down Expand Up @@ -1574,7 +1586,9 @@ spec:
checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.yaml") . | sha256sum }}
checksum/auth: {{ include (print $.Template.BasePath "/secrets_st2auth.yaml") . | sha256sum }}
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 }}
{{- end }}
{{- if .Values.st2.overrides }}
checksum/overrides: {{ include (print $.Template.BasePath "/configmaps_overrides.yaml") . | sha256sum }}
{{- end }}
Expand Down
Loading