From 027f1b64c7bda3613eb6bfce291137d6aad2ecb9 Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Thu, 28 Mar 2024 21:50:17 +0200
Subject: [PATCH] Monasca: Enable custom annotations

Enable custom annotations for pods [deployments, daemonsets]

Change-Id: Ia1e1d54e9fdaaed4b3af4b67e79e6615d37167c9
---
 monasca/Chart.yaml                             | 2 +-
 monasca/templates/daemonset-agent.yaml         | 1 +
 monasca/templates/deployment-agent.yaml        | 1 +
 monasca/templates/deployment-api.yaml          | 1 +
 monasca/templates/deployment-notification.yaml | 1 +
 monasca/templates/deployment-persister.yaml    | 1 +
 monasca/values_overrides/annotations.yaml      | 9 +++++++++
 releasenotes/notes/monasca.yaml                | 1 +
 8 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 monasca/values_overrides/annotations.yaml

diff --git a/monasca/Chart.yaml b/monasca/Chart.yaml
index af8962e356..f1d0362dc0 100644
--- a/monasca/Chart.yaml
+++ b/monasca/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Monasca API
 name: monasca
-version: 0.1.1
+version: 0.1.2
 home: https://docs.openstack.org/monasca/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Monasca/OpenStack_Project_Monasca_vertical.png
 sources:
diff --git a/monasca/templates/daemonset-agent.yaml b/monasca/templates/daemonset-agent.yaml
index 4995824de3..bc00c7db61 100644
--- a/monasca/templates/daemonset-agent.yaml
+++ b/monasca/templates/daemonset-agent.yaml
@@ -64,6 +64,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 "monasca_agent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "monasca-agent" "containerNames" (list "monasca-agent" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/monasca/templates/deployment-agent.yaml b/monasca/templates/deployment-agent.yaml
index df65004c83..4d65e422c9 100644
--- a/monasca/templates/deployment-agent.yaml
+++ b/monasca/templates/deployment-agent.yaml
@@ -65,6 +65,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 "monasca_agent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "monasca-agent" "containerNames" (list "monasca-agent" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/monasca/templates/deployment-api.yaml b/monasca/templates/deployment-api.yaml
index 350f441bc7..bee0c85be3 100644
--- a/monasca/templates/deployment-api.yaml
+++ b/monasca/templates/deployment-api.yaml
@@ -53,6 +53,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 "monasca_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "monasca-api" "containerNames" (list "monasca-api" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/monasca/templates/deployment-notification.yaml b/monasca/templates/deployment-notification.yaml
index 30c7029c2d..2eb2d16ab4 100644
--- a/monasca/templates/deployment-notification.yaml
+++ b/monasca/templates/deployment-notification.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 "monasca_notification" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "monasca-notification" "containerNames" (list "monasca-notification" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/monasca/templates/deployment-persister.yaml b/monasca/templates/deployment-persister.yaml
index aeefa7c3ec..9f8af572b6 100644
--- a/monasca/templates/deployment-persister.yaml
+++ b/monasca/templates/deployment-persister.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 "monasca_persister" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "monasca-persister" "containerNames" (list "monasca-persister" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/monasca/values_overrides/annotations.yaml b/monasca/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..9f408be62d
--- /dev/null
+++ b/monasca/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    monasca_api:
+      another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/monasca.yaml b/releasenotes/notes/monasca.yaml
index 512b6d65a8..c3af17ef08 100644
--- a/releasenotes/notes/monasca.yaml
+++ b/releasenotes/notes/monasca.yaml
@@ -2,4 +2,5 @@
 monasca:
   - 0.1.0 Initial Chart
   - 0.1.1 Update osh-selenium image used by default
+  - 0.1.2 Enable custom annotations for Openstack pods
 ...