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

add external secret for datastore encryption #366

Merged
merged 4 commits into from
May 22, 2023
Merged

add external secret for datastore encryption #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d38899
add external secret for datastore encryption
guzzijones May 15, 2023
c051c70
add existingDatastoreSecret to values.yaml
guzzijones May 15, 2023
0fa1415
fix name of datastore-crypto-key
guzzijones May 16, 2023
c4fdcee
pin version of helm-unittest plugin
guzzijones May 22, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/unit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# We should periodically check to see if another fork has taken over maintenance,
# as the de-facto "best" fork has changed several times over the years.
run: |
helm plugin install https://github.com/quintush/helm-unittest
helm plugin install https://github.com/quintush/helm-unittest --version v0.2.11
- name: Install chart dependencies
run: |
Expand Down
8 changes: 8 additions & 0 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ Create the name of the stackstorm-ha st2 auth secret to use
{{- default $name .Values.st2.existingAuthSecret -}}
{{- end -}}

{{/*
Create the name of the stackstorm-ha st2 datastore secret to use
*/}}
{{- define "stackstorm-ha.secrets.st2Datastore" -}}
{{- $name := print .Release.Name "-st2-datastore-crypto-key" -}}
{{- default $name .Values.st2.existingDatastoreSecret -}}
{{- end -}}


{{/*
Generate '-' prefix only when the variable is defined
Expand Down
14 changes: 7 additions & 7 deletions templates/deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -588,7 +588,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -809,7 +809,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -924,7 +924,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -1230,7 +1230,7 @@ spec:
{{- if ne "disable" (default "" $.Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ $.Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" $ }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -1379,7 +1379,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down Expand Up @@ -1658,7 +1658,7 @@ spec:
{{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
- name: st2-encryption-key-vol
secret:
secretName: {{ .Release.Name }}-st2-datastore-crypto-key
secretName: {{ include "stackstorm-ha.secrets.st2Datastore" . }}
items:
- key: datastore_crypto_key
path: datastore_key.json
Expand Down
2 changes: 2 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ st2:
#password: Ch@ngeMe
# Name of existing ST2 Auth secret, disables creation of this secret
# existingAuthSecret: ""
# Name of existing ST2 datastore secret, disables creation of this secret
# existingDatastoreSecret: ""

# ST2 crypto key for the K/V datastore.
# See https://docs.stackstorm.com/datastore.html#securing-secrets-admin-only for more info.
Expand Down