From 1e49055ceac8f83118a6c1c15267694a3017e9b0 Mon Sep 17 00:00:00 2001
From: josebb <jose.bautista.barato@gmail.com>
Date: Tue, 5 Apr 2022 20:38:07 +0300
Subject: [PATCH] Add helm hook annotation in placement db-sync and db-migrate
 jobs

Change-Id: I9e64a9e8f5082f23f29ebb831b1ad9cab1975165
---
 placement/Chart.yaml                    |  2 +-
 placement/templates/job-db-migrate.yaml |  4 ++++
 placement/templates/job-db-sync.yaml    | 10 +++++++++-
 releasenotes/notes/placement.yaml       |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/placement/Chart.yaml b/placement/Chart.yaml
index f0ef9ca3d1..39f2889bac 100644
--- a/placement/Chart.yaml
+++ b/placement/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Placement
 name: placement
-version: 0.2.6
+version: 0.2.7
 home: https://docs.openstack.org/placement/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
 sources:
diff --git a/placement/templates/job-db-migrate.yaml b/placement/templates/job-db-migrate.yaml
index ef7337786c..1b7f86358d 100644
--- a/placement/templates/job-db-migrate.yaml
+++ b/placement/templates/job-db-migrate.yaml
@@ -25,6 +25,10 @@ metadata:
   labels:
 {{ tuple $envAll "placement" "db-migrate" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
+{{- if .Values.helm3_hook }}
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "-4"
+{{- end }}
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
   template:
diff --git a/placement/templates/job-db-sync.yaml b/placement/templates/job-db-sync.yaml
index e1c59360f5..fea53d9702 100644
--- a/placement/templates/job-db-sync.yaml
+++ b/placement/templates/job-db-sync.yaml
@@ -14,13 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- define "metadata.annotations.job.db_sync" }}
+helm.sh/hook: post-install,post-upgrade
+helm.sh/hook-weight: "-3"
+{{- end }}
+
 {{- if .Values.manifests.job_db_sync }}
 {{- $dbSyncJob := dict "envAll" . "serviceName" "placement" -}}
 {{- if .Values.manifests.certificates -}}
 {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
 {{- end -}}
+{{- if .Values.helm3_hook }}
+{{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }}
+{{- end }}
 {{- if .Values.pod.tolerations.placement.enabled -}}
 {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}}
 {{- end -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml
index 35070d2aea..2cdfff8e71 100644
--- a/releasenotes/notes/placement.yaml
+++ b/releasenotes/notes/placement.yaml
@@ -15,4 +15,5 @@ placement:
   - 0.2.4 Helm 3 - Fix Job Labels
   - 0.2.5 Update htk requirements repo
   - 0.2.6 Enable taint toleration for Openstack services
+  - 0.2.7 Add helm hook annotations for db-sync job
 ...