Skip to content

Commit 5456f40

Browse files
authored
Merge branch 'master' into packs-volumes
2 parents aedf6cf + c3725b0 commit 5456f40

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* Make system_user configurable when using custom st2actionrunner images that do not provide stanley (#220) (by @cognifloyd)
1919
* Allow providing scripts in values for use in lifecycle postStart hooks of all deployments. (#206) (by @cognifloyd)
2020
* Add preRegisterContentCommand in an initContainer for register-content job to run last-minute content customizations (#213) (by @cognifloyd)
21+
* Fix a bug when datastore cryto keys are not able to read by the rules engine. ``datastore_crypto_key`` volume is now mounted on the ``st2rulesengine`` pods (#223) (by @moti1992)
2122
* New feature: Shared packs volumes `st2.packs.volumes`. Allow using cluster-specific persistent volumes to store packs, virtualenvs, and (optionally) configs. This enables using `st2 pack install`. It even works with `st2packs` images in `st2.packs.images`. (#199) (by @cognifloyd)
2223

2324
## v0.60.0

templates/deployments.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ spec:
508508
heritage: {{ .Release.Service }}
509509
annotations:
510510
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
511+
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
511512
{{- if .Values.st2rulesengine.postStartScript }}
512513
checksum/post-start-script: {{ .Values.st2rulesengine.postStartScript | sha256sum }}
513514
{{- end }}
@@ -534,6 +535,11 @@ spec:
534535
name: {{ .Release.Name }}-st2-urls
535536
volumeMounts:
536537
{{- include "st2-config-volume-mounts" . | nindent 8 }}
538+
{{- if .Values.st2.datastore_crypto_key }}
539+
- name: st2-encryption-key-vol
540+
mountPath: /etc/st2/keys
541+
readOnly: true
542+
{{- end }}
537543
{{- if .Values.st2rulesengine.postStartScript }}
538544
- name: st2-post-start-script-vol
539545
mountPath: /post-start.sh

0 commit comments

Comments
 (0)