Skip to content

Commit 64dfa3f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "fix(keystone): ensure fernet and credential keys are not deleted"
2 parents f17a395 + a396e01 commit 64dfa3f

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

keystone/templates/secret-credential-keys.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ metadata:
2222
{{- if .Values.helm3_hook }}
2323
annotations:
2424
"helm.sh/hook": pre-install
25+
"helm.sh/resource-policy": keep
2526
{{- end }}
2627
type: Opaque
2728
data:

keystone/templates/secret-fernet-keys.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ metadata:
2323
{{- if .Values.helm3_hook }}
2424
annotations:
2525
"helm.sh/hook": pre-install
26+
"helm.sh/resource-policy": keep
2627
{{- end }}
2728
type: Opaque
2829
data:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
keystone:
3+
- |
4+
Annotate credential and fernet keys secrets with the Helm keep policy.
5+
While helm does not clean up hook resources today, their documentation
6+
says that it is coming and users should annotate resources they do not
7+
expect to be deleted appropriately. Some GitOps tools like ArgoCD
8+
implement the cleanup today as part of their Helm support.
9+
...

0 commit comments

Comments
 (0)