From fe4719d1c9b61dadcfc92bad50639c6b3af1d293 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Tue, 2 Apr 2024 18:45:04 -0500
Subject: [PATCH] keystone: fix custom annotations without helm3 hooks

Fixes 3458483fa

Change-Id: Iaf7fadf1b6ccfe701784a61f1f76bd0d8b43d0bd
Signed-off-by: Doug Goldstein <doug.goldstein@rackspace.com>
---
 keystone/Chart.yaml                      | 2 +-
 keystone/templates/job-fernet-setup.yaml | 2 +-
 releasenotes/notes/keystone.yaml         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 049e39d807..449d906a33 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.3.10
+version: 0.3.11
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml
index ae9f42cbd4..d52aa6ce42 100644
--- a/keystone/templates/job-fernet-setup.yaml
+++ b/keystone/templates/job-fernet-setup.yaml
@@ -56,8 +56,8 @@ metadata:
   name: keystone-fernet-setup
   labels:
 {{ tuple $envAll "keystone" "fernet-setup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-{{- if .Values.helm3_hook }}
   annotations:
+{{- if .Values.helm3_hook }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index dcdb7aea7d..d5ec5aee68 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -57,4 +57,5 @@ keystone:
   - 0.3.8 Enable custom annotations for Openstack pods
   - 0.3.9 Add 2024.1 overrides
   - 0.3.10 Allow custom annotations on jobs
+  - 0.3.11 Fix custom annotations when helm3_hook is disabled
 ...