Skip to content

Commit 9cfcb89

Browse files
authored
Merge pull request #148 from rahulshinde26/master
mounting datastore_crypto_key for scheduler deployment
2 parents 5575afc + 55746de commit 9cfcb89

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## In Development
4+
* Fix a bug when datastore encrypted keys didn't work in scheduled rules. datastore_crypto_key is now shared with the ``st2scheduler`` pods (#148) (by @rahulshinde26)
5+
36
## v0.31.0
47
* Fix chart compatibility with Helm versions >= `2.16.8` by downgrading `mongodb-replicaset` from `3.14.0` to `3.12.0` (#137) (by @AbhyudayaSharma)
58
* Allow injection of datastore key in cluster (#115) (by @AngryDeveloper)

templates/deployments.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ spec:
707707
heritage: {{ .Release.Service }}
708708
annotations:
709709
checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
710+
checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
710711
spec:
711712
{{- if .Values.enterprise.enabled }}
712713
imagePullSecrets:
@@ -729,12 +730,25 @@ spec:
729730
- name: st2-config-vol
730731
mountPath: /etc/st2/st2.user.conf
731732
subPath: st2.user.conf
733+
{{- if .Values.secrets.st2.datastore_crypto_key }}
734+
- name: st2-encryption-key-vol
735+
mountPath: /etc/st2/keys
736+
readOnly: true
737+
{{- end }}
732738
resources:
733739
{{ toYaml .Values.st2scheduler.resources | indent 10 }}
734740
{{- if .Values.st2scheduler.serviceAccount.attach }}
735741
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
736742
{{- end }}
737743
volumes:
744+
{{- if .Values.secrets.st2.datastore_crypto_key }}
745+
- name: st2-encryption-key-vol
746+
secret:
747+
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
748+
items:
749+
- key: datastore_crypto_key
750+
path: datastore_key.json
751+
{{- end }}
738752
- name: st2-config-vol
739753
configMap:
740754
name: {{ .Release.Name }}-st2-config

0 commit comments

Comments
 (0)