From b4c58ca27b65b2839541845b9a0f86d38cf105c2 Mon Sep 17 00:00:00 2001
From: Thiago Brito <thiago.brito@windriver.com>
Date: Wed, 29 Sep 2021 19:29:52 -0300
Subject: [PATCH] Fixing nova's helm.sh/hook disablement

It's impossible to disable the helm.sh/hook for the nova-ks-service
job since the hook is being added in duplicity to the job dictionary
before the check for Values.helm3_hook. This commit removes the
duplicity so we can disable it properly.

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: Ie72a13afc81bce4424b10bbc542dc7c44dd38975
---
 nova/Chart.yaml                    | 2 +-
 nova/templates/job-ks-service.yaml | 2 +-
 releasenotes/notes/nova.yaml       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index b4115eb9e3..5c95d0c955 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml
index 626edcb288..d9eb3b5b96 100644
--- a/nova/templates/job-ks-service.yaml
+++ b/nova/templates/job-ks-service.yaml
@@ -18,7 +18,7 @@ helm.sh/hook-weight: "-3"
 {{- end }}
 
 {{- if .Values.manifests.job_ks_service }}
-{{- $ksServiceJob := dict "envAll" . "serviceName" "nova" "serviceTypes" ( tuple "compute" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}}
+{{- $ksServiceJob := dict "envAll" . "serviceName" "nova" "serviceTypes" ( tuple "compute" ) -}}
 {{- if .Values.manifests.certificates -}}
 {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.compute.osapi.internal -}}
 {{- end -}}
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 1404eeb794..d0ed11adbb 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -37,4 +37,5 @@ nova:
   - 0.2.14 Use helm.sh/hook annotations for jobs
   - 0.2.15 Fix archive-deleted-rows for enabling date command as value for before option
   - 0.2.16 Remove the policy document in values file
+  - 0.2.17 Fix disablement of helm.sh/hook for Helm v2
 ...