From fd5687ad5f69f3082705888858263db23ce764ab Mon Sep 17 00:00:00 2001
From: josebb <jose.bautista.barato@gmail.com>
Date: Fri, 22 Apr 2022 21:08:49 +0300
Subject: [PATCH] Fix job annotations for db init job in barbican

Change-Id: I190008ff4905b29d27c1984572570a61bb0e1e1e
---
 barbican/Chart.yaml                 | 2 +-
 barbican/templates/job-db-init.yaml | 4 ++--
 releasenotes/notes/barbican.yaml    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 7f9864f3ee..076129e77c 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.2.10
+version: 0.2.11
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml
index 1d1f3a504c..afe16dcc68 100644
--- a/barbican/templates/job-db-init.yaml
+++ b/barbican/templates/job-db-init.yaml
@@ -21,8 +21,8 @@ helm.sh/hook-weight: "-5"
 
 {{- if .Values.manifests.job_db_init }}
 {{- $serviceName := "barbican" -}}
-{{- $dbToInit := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "DEFAULT" "configDbKey" "sql_connection" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
-{{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbToInit" $dbToInit -}}
+{{- $dbToInit := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "DEFAULT" "configDbKey" "sql_connection" -}}
+{{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbToInit" $dbToInit "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
 {{- if .Values.manifests.certificates -}}
 {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
 {{- end -}}
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index cd7d94bc81..39d2823bee 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -14,4 +14,5 @@ barbican:
   - 0.2.8 Update htk requirements repo
   - 0.2.9 Removed default policy in favor in code policy
   - 0.2.10 Enable taint toleration for Openstack services
+  - 0.2.11 Fix job annotations for db init job
 ...