openstack-armada-app/openstack-helm/files/0020-Fixing-keystone-helm-release-hooks-and-weights.patch
Luan Nunes Utimura 8e45c65c7d OSH-Patch: Fixing keystone helm release hooks
This patch adds a helm hook/hook-weight to two Keystone secrets that
weren't being correctly replaced during the stx-openstack application
update.

As a result, other jobs/pods that depended on these secrets failed, and
ultimately the Keystone helm release wasn't upgraded by Helm.

Test plan:
PASS - Build openstack-helm package
PASS - Build stx-openstack-helm-fluxcd package
PASS - Build stx-openstack helm charts
PASS - Upload/apply/remove stx-openstack

Closes-Bug: 2000172

Signed-off-by: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
Change-Id: I4cd39bc0326b2af2c5d1a9c2c2a68198035bd300
2022-12-22 14:22:48 -03:00

42 lines
1.4 KiB
Diff

From a381ce34a6d16cb6df7497503d7b7ae2ee8de316 Mon Sep 17 00:00:00 2001
From: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
Date: Tue, 20 Dec 2022 14:07:19 -0300
Subject: [PATCH] Fixing keystone helm release hooks and weights
---
keystone/templates/secret-credential-keys.yaml | 3 ++-
keystone/templates/secret-fernet-keys.yaml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/keystone/templates/secret-credential-keys.yaml b/keystone/templates/secret-credential-keys.yaml
index 8a2c5eb5..307bb72b 100644
--- a/keystone/templates/secret-credential-keys.yaml
+++ b/keystone/templates/secret-credential-keys.yaml
@@ -21,7 +21,8 @@ metadata:
name: keystone-credential-keys
{{- if .Values.helm3_hook }}
annotations:
- "helm.sh/hook": pre-install
+ "helm.sh/hook": pre-install,post-upgrade
+ "helm.sh/hook-weight": "-6"
{{- end }}
type: Opaque
data:
diff --git a/keystone/templates/secret-fernet-keys.yaml b/keystone/templates/secret-fernet-keys.yaml
index 8af09730..a7eddd14 100644
--- a/keystone/templates/secret-fernet-keys.yaml
+++ b/keystone/templates/secret-fernet-keys.yaml
@@ -22,7 +22,8 @@ metadata:
name: keystone-fernet-keys
{{- if .Values.helm3_hook }}
annotations:
- "helm.sh/hook": pre-install
+ "helm.sh/hook": pre-install,post-upgrade
+ "helm.sh/hook-weight": "-6"
{{- end }}
type: Opaque
data:
--
2.25.1