From b50501344f1040886573cb3074491fa616ae69ff Mon Sep 17 00:00:00 2001
From: "Singh, Jasvinder (js581j)" <js581j@att.com>
Date: Tue, 21 Nov 2023 16:09:01 -0600
Subject: [PATCH] Fix indentation in heat chart

This commit is to fix the issue with heat chart, because of
indentation issue in annotations. The current chart is not allowing
the upgrade via helm if not fixed. Also bumping the chart version
and added release notes.

Change-Id: Ic22d2d20d00febc51bd410316522a85d2f7e582e
---
 heat/Chart.yaml                             | 2 +-
 heat/templates/cron-job-engine-cleaner.yaml | 2 +-
 heat/templates/cron-job-purge-deleted.yaml  | 2 +-
 releasenotes/notes/heat.yaml                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index c201d30293..248aa3cc61 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 0.3.7
+version: 0.3.8
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml
index a7eded42ac..51b5b281c5 100644
--- a/heat/templates/cron-job-engine-cleaner.yaml
+++ b/heat/templates/cron-job-engine-cleaner.yaml
@@ -50,7 +50,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 12 }}
             configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
             configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ dict "envAll" $envAll "podName" "heat-engine-cleaner" "containerNames" (list "heat-engine-cleaner" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+{{ dict "envAll" $envAll "podName" "heat-engine-cleaner" "containerNames" (list "heat-engine-cleaner" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 12 }}
         spec:
           serviceAccountName: {{ $serviceAccountName }}
 {{ dict "envAll" $envAll "application" "engine_cleaner" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 10 }}
diff --git a/heat/templates/cron-job-purge-deleted.yaml b/heat/templates/cron-job-purge-deleted.yaml
index 4d83c29493..1c6226b37c 100644
--- a/heat/templates/cron-job-purge-deleted.yaml
+++ b/heat/templates/cron-job-purge-deleted.yaml
@@ -45,7 +45,7 @@ spec:
 {{ tuple $envAll "heat" "purge-deleted" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }}
           annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 12 }}
-{{ dict "envAll" $envAll "podName" "heat-purge-deleted" "containerNames" (list "init" "heat-purge-deleted" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+{{ dict "envAll" $envAll "podName" "heat-purge-deleted" "containerNames" (list "init" "heat-purge-deleted" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 12 }}
         spec:
           serviceAccountName: {{ $serviceAccountName }}
           restartPolicy: OnFailure
diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml
index 88e86a20c9..5dec1d1de1 100644
--- a/releasenotes/notes/heat.yaml
+++ b/releasenotes/notes/heat.yaml
@@ -33,4 +33,5 @@ heat:
   - 0.3.5 Add 2023.1 overrides
   - 0.3.6 Add Ubuntu Jammy overrides
   - 0.3.7 Add 2023.2 Ubuntu Jammy overrides
+  - 0.3.8 Fixed annotation indentation for jobs
 ...