From 0e8de24ccc3d8ad885a66481545456860087df8c Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Thu, 28 Mar 2024 21:42:52 +0200
Subject: [PATCH] Mistral: Enable custom annotations

Enable custom annotations for pods [deployments, daemonsets]

Change-Id: I9d6ac9bfdcabb24709b9d2a874712d675edd3b7c
---
 mistral/Chart.yaml                         | 2 +-
 mistral/templates/deployment-api.yaml      | 1 +
 mistral/templates/deployment-executor.yaml | 1 +
 mistral/values_overrides/annotations.yaml  | 9 +++++++++
 releasenotes/notes/mistral.yaml            | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 mistral/values_overrides/annotations.yaml

diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml
index 21af26f770..bf910a3ec8 100644
--- a/mistral/Chart.yaml
+++ b/mistral/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Mistral
 name: mistral
-version: 0.2.7
+version: 0.2.8
 home: https://docs.openstack.org/mistral/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Mistral/OpenStack_Project_Mistral_vertical.png
 sources:
diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml
index 480de5a0d0..77426ac9ec 100644
--- a/mistral/templates/deployment-api.yaml
+++ b/mistral/templates/deployment-api.yaml
@@ -43,6 +43,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "mistral_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml
index a3ef478d4f..676fb1755c 100644
--- a/mistral/templates/deployment-executor.yaml
+++ b/mistral/templates/deployment-executor.yaml
@@ -43,6 +43,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "mistral_executor" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/mistral/values_overrides/annotations.yaml b/mistral/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..3256d842bb
--- /dev/null
+++ b/mistral/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    mistral_api:
+      another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/mistral.yaml b/releasenotes/notes/mistral.yaml
index 99af32440a..e55bb46a60 100644
--- a/releasenotes/notes/mistral.yaml
+++ b/releasenotes/notes/mistral.yaml
@@ -11,4 +11,5 @@ mistral:
   - 0.2.5 Added OCI registry authentication
   - 0.2.6 Use HTTP probe instead of TCP probe
   - 0.2.7 Remove default policy rules
+  - 0.2.8 Enable custom annotations for Openstack pods
 ...