Skip to content

Commit 61f5a2c

Browse files
cognifloydcognifloyd
committed
datastore_crypto_key is always required now
1 parent b99913b commit 61f5a2c

File tree

2 files changed

+0
-30
lines changed

2 files changed

+0
-30
lines changed

‎templates/configmaps_st2-conf.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ data:
4242
{{- end }}
4343
port = {{ index .Values "mongodb" "service" "port" }}
4444
{{- end }}
45-
{{- if .Values.st2.datastore_crypto_key }}
4645
[keyvalue]
4746
encryption_key_path = /etc/st2/keys/datastore_key.json
48-
{{- end }}
4947
{{- if .Values.st2.rbac.enabled }}
5048
[rbac]
5149
enable = True

‎templates/deployments.yaml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,9 @@ spec:
198198
name: {{ .Release.Name }}-st2-urls
199199
volumeMounts:
200200
{{- include "st2-config-volume-mounts" . | nindent 8 }}
201-
{{- if .Values.st2.datastore_crypto_key }}
202201
- name: st2-encryption-key-vol
203202
mountPath: /etc/st2/keys
204203
readOnly: true
205-
{{- end }}
206204
{{- include "packs-volume-mounts" . | nindent 8 }}
207205
{{- if .Values.st2.packs.volumes.enabled }}
208206
{{- include "pack-configs-volume-mount" . | nindent 8 }}
@@ -222,14 +220,12 @@ spec:
222220
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
223221
{{- end }}
224222
volumes:
225-
{{- if .Values.st2.datastore_crypto_key }}
226223
- name: st2-encryption-key-vol
227224
secret:
228225
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
229226
items:
230227
- key: datastore_crypto_key
231228
path: datastore_key.json
232-
{{- end }}
233229
{{- include "st2-config-volume" . | nindent 8 }}
234230
{{- include "packs-volumes" . | nindent 8 }}
235231
{{- if .Values.st2.packs.volumes.enabled }}
@@ -542,11 +538,9 @@ spec:
542538
name: {{ .Release.Name }}-st2-urls
543539
volumeMounts:
544540
{{- include "st2-config-volume-mounts" . | nindent 8 }}
545-
{{- if .Values.st2.datastore_crypto_key }}
546541
- name: st2-encryption-key-vol
547542
mountPath: /etc/st2/keys
548543
readOnly: true
549-
{{- end }}
550544
{{- if .Values.st2rulesengine.postStartScript }}
551545
- name: st2-post-start-script-vol
552546
mountPath: /post-start.sh
@@ -563,14 +557,12 @@ spec:
563557
{{- end }}
564558
volumes:
565559
{{- include "st2-config-volume" . | nindent 8 }}
566-
{{- if .Values.st2.datastore_crypto_key }}
567560
- name: st2-encryption-key-vol
568561
secret:
569562
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
570563
items:
571564
- key: datastore_crypto_key
572565
path: datastore_key.json
573-
{{- end }}
574566
{{- if .Values.st2rulesengine.postStartScript }}
575567
- name: st2-post-start-script-vol
576568
configMap:
@@ -751,11 +743,9 @@ spec:
751743
name: {{ .Release.Name }}-st2-urls
752744
volumeMounts:
753745
{{- include "st2-config-volume-mounts" . | nindent 8 }}
754-
{{- if .Values.st2.datastore_crypto_key }}
755746
- name: st2-encryption-key-vol
756747
mountPath: /etc/st2/keys
757748
readOnly: true
758-
{{- end }}
759749
{{- range .Values.st2workflowengine.extra_volumes }}
760750
- name: {{ required "Each volume must have a 'name' in st2workflowengine.extra_volumes" .name }}
761751
{{- tpl (required "Each volume must have a 'mount' definition in st2workflowengine.extra_volumes" .mount | toYaml) $ | nindent 10 }}
@@ -776,14 +766,12 @@ spec:
776766
{{- end }}
777767
volumes:
778768
{{- include "st2-config-volume" . | nindent 8 }}
779-
{{- if .Values.st2.datastore_crypto_key }}
780769
- name: st2-encryption-key-vol
781770
secret:
782771
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
783772
items:
784773
- key: datastore_crypto_key
785774
path: datastore_key.json
786-
{{- end }}
787775
{{- range .Values.st2workflowengine.extra_volumes }}
788776
- name: {{ required "Each volume must have a 'name' in st2workflowengine.extra_volumes" .name }}
789777
{{- tpl (required "Each volume must have a 'volume' definition in st2workflowengine.extra_volumes" .volume | toYaml) $ | nindent 10 }}
@@ -869,11 +857,9 @@ spec:
869857
name: {{ .Release.Name }}-st2-urls
870858
volumeMounts:
871859
{{- include "st2-config-volume-mounts" . | nindent 8 }}
872-
{{- if .Values.st2.datastore_crypto_key }}
873860
- name: st2-encryption-key-vol
874861
mountPath: /etc/st2/keys
875862
readOnly: true
876-
{{- end }}
877863
{{- if .Values.st2scheduler.postStartScript }}
878864
- name: st2-post-start-script-vol
879865
mountPath: /post-start.sh
@@ -889,14 +875,12 @@ spec:
889875
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
890876
{{- end }}
891877
volumes:
892-
{{- if .Values.st2.datastore_crypto_key }}
893878
- name: st2-encryption-key-vol
894879
secret:
895880
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
896881
items:
897882
- key: datastore_crypto_key
898883
path: datastore_key.json
899-
{{- end }}
900884
{{- include "st2-config-volume" . | nindent 8 }}
901885
{{- if .Values.st2scheduler.postStartScript }}
902886
- name: st2-post-start-script-vol
@@ -1123,11 +1107,9 @@ spec:
11231107
volumeMounts:
11241108
{{- include "st2-config-volume-mounts" $ | nindent 8 }}
11251109
{{- include "packs-volume-mounts" $ | nindent 8 }}
1126-
{{- if $.Values.st2.datastore_crypto_key }}
11271110
- name: st2-encryption-key-vol
11281111
mountPath: /etc/st2/keys
11291112
readOnly: true
1130-
{{- end }}
11311113
{{- range $sensor.extra_volumes }}
11321114
- name: {{ required "Each volume must have a 'name' in $sensor.extra_volumes" .name }}
11331115
{{- tpl (required "Each volume must have a 'mount' definition in $sensor.extra_volumes" .mount | toYaml) $ | nindent 10 }}
@@ -1147,14 +1129,12 @@ spec:
11471129
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" $ }}
11481130
{{- end }}
11491131
volumes:
1150-
{{- if $.Values.st2.datastore_crypto_key }}
11511132
- name: st2-encryption-key-vol
11521133
secret:
11531134
secretName: {{ $.Release.Name }}-st2-datastore-crypto-key
11541135
items:
11551136
- key: datastore_crypto_key
11561137
path: datastore_key.json
1157-
{{- end }}
11581138
{{- include "st2-config-volume" $ | nindent 8 }}
11591139
{{- include "packs-volumes" $ | nindent 8 }}
11601140
{{- range $sensor.extra_volumes }}
@@ -1262,11 +1242,9 @@ spec:
12621242
{{- include "st2-config-volume-mounts" . | nindent 8 }}
12631243
- name: st2-ssh-key-vol
12641244
mountPath: {{ tpl .Values.st2.system_user.ssh_key_file . | dir | dir }}/.ssh-key-vol/
1265-
{{- if .Values.st2.datastore_crypto_key }}
12661245
- name: st2-encryption-key-vol
12671246
mountPath: /etc/st2/keys
12681247
readOnly: true
1269-
{{- end }}
12701248
{{- include "packs-volume-mounts" . | nindent 8 }}
12711249
{{- if .Values.st2.packs.volumes.enabled }}
12721250
{{- include "pack-configs-volume-mount" . | nindent 8 }}
@@ -1288,14 +1266,12 @@ spec:
12881266
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
12891267
{{- end }}
12901268
volumes:
1291-
{{- if .Values.st2.datastore_crypto_key }}
12921269
- name: st2-encryption-key-vol
12931270
secret:
12941271
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
12951272
items:
12961273
- key: datastore_crypto_key
12971274
path: datastore_key.json
1298-
{{- end }}
12991275
{{- include "st2-config-volume" . | nindent 8 }}
13001276
- name: st2-ssh-key-vol
13011277
secret:
@@ -1534,11 +1510,9 @@ spec:
15341510
mountPath: /root/.st2/
15351511
- name: st2-ssh-key-vol
15361512
mountPath: {{ tpl .Values.st2.system_user.ssh_key_file . | dir | dir }}/.ssh-key-vol/
1537-
{{- if .Values.st2.datastore_crypto_key }}
15381513
- name: st2-encryption-key-vol
15391514
mountPath: /etc/st2/keys
15401515
readOnly: true
1541-
{{- end }}
15421516
{{- include "packs-volume-mounts" . | nindent 8 }}
15431517
{{- include "pack-configs-volume-mount" . | nindent 8 }}
15441518
{{- range .Values.st2client.extra_volumes }}
@@ -1561,14 +1535,12 @@ spec:
15611535
memory: "5Mi"
15621536
cpu: "5m"
15631537
volumes:
1564-
{{- if .Values.st2.datastore_crypto_key }}
15651538
- name: st2-encryption-key-vol
15661539
secret:
15671540
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
15681541
items:
15691542
- key: datastore_crypto_key
15701543
path: datastore_key.json
1571-
{{- end }}
15721544
{{- include "st2-config-volume" . | nindent 8 }}
15731545
{{- if .Values.st2.rbac.enabled }}
15741546
- name: st2-rbac-roles-vol

0 commit comments

Comments
 (0)