Skip to content

Commit c67d2a2

Browse files
- Typo on sensor containers datastore key
- Cleanup CHANGELOG diff - Remove injection of datastore key in rulesengine as it's not needed
1 parent 9bfbb27 commit c67d2a2

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* Add an option to inject hostAliases in the st2actionrunner containers (#114)
2929
* Add support for Service Accounts (#117) (by @Vince-Chenal)
3030

31-
3231
## v0.24.0
3332
* Fix st2web ingress to use `/` path by default instead of `/*`, useful for nginx ingress controller (#103) (by @erenatas)
3433
* Add ability of templating on `st2.keyvalue` in Helm Values (#108) (by @erenatas)

templates/deployments.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,6 @@ spec:
453453
heritage: {{ .Release.Service }}
454454
annotations:
455455
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
456-
{{- if $.Values.secrets.st2.datastore_crypto_key }}
457-
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
458-
{{- end }}
459456
spec:
460457
{{- if .Values.enterprise.enabled }}
461458
imagePullSecrets:
@@ -478,11 +475,6 @@ spec:
478475
- name: st2-config-vol
479476
mountPath: /etc/st2/st2.user.conf
480477
subPath: st2.user.conf
481-
{{- if .Values.secrets.st2.datastore_crypto_key }}
482-
- name: st2-encryption-key-vol
483-
mountPath: /etc/st2/keys
484-
readOnly: true
485-
{{- end }}
486478
resources:
487479
{{ toYaml .Values.st2rulesengine.resources | indent 10 }}
488480
{{- if .Values.st2rulesengine.serviceAccount.attach }}
@@ -880,7 +872,8 @@ spec:
880872
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") $ | sha256sum }}
881873
checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.yaml") $ | sha256sum }}
882874
{{- if $.Values.secrets.st2.datastore_crypto_key }}
883-
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") & | sha256sum }}
875+
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") $ | sha256sum }}
876+
{{- end }}
884877
{{- if .annotations }}
885878
{{ toYaml .annotations | indent 8 }}
886879
{{- end }}
@@ -1044,6 +1037,7 @@ spec:
10441037
checksum/ssh: {{ include (print $.Template.BasePath "/secrets_ssh.yaml") . | sha256sum }}
10451038
{{- if $.Values.secrets.st2.datastore_crypto_key }}
10461039
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
1040+
{{- end }}
10471041
{{- if .Values.st2actionrunner.annotations }}
10481042
{{ toYaml .Values.st2actionrunner.annotations | indent 8 }}
10491043
{{- end }}

0 commit comments

Comments
 (0)