From 4bc719c4b669cbd0cddc8bdf4632e497955388e7 Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Mon, 1 Apr 2024 23:34:26 +0300
Subject: [PATCH] Senlin: Enable custom annotations

Enable custom annotations for pods [deployments, daemonsets]

Change-Id: I338097a1b7fee756c8a07f9d518d9af707bab215
---
 releasenotes/notes/senlin.yaml                  | 1 +
 senlin/Chart.yaml                               | 2 +-
 senlin/templates/deployment-api.yaml            | 1 +
 senlin/templates/deployment-conductor.yaml      | 1 +
 senlin/templates/deployment-engine.yaml         | 1 +
 senlin/templates/deployment-health-manager.yaml | 1 +
 senlin/values_overrides/annotations.yaml        | 9 +++++++++
 7 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 senlin/values_overrides/annotations.yaml

diff --git a/releasenotes/notes/senlin.yaml b/releasenotes/notes/senlin.yaml
index 7952536e50..d9930545c9 100644
--- a/releasenotes/notes/senlin.yaml
+++ b/releasenotes/notes/senlin.yaml
@@ -13,4 +13,5 @@ senlin:
   - 0.2.8 Remove default policy rules
   - 0.2.9 Define service_type in keystone_authtoken to support application credentials with access rules
   - 0.2.10 Uses uWSGI for API
+  - 0.2.11 Enable custom annotations for Openstack pods
 ...
diff --git a/senlin/Chart.yaml b/senlin/Chart.yaml
index f7e4c142fc..714e838ad6 100644
--- a/senlin/Chart.yaml
+++ b/senlin/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Senlin
 name: senlin
-version: 0.2.10
+version: 0.2.11
 home: https://docs.openstack.org/senlin/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Senlin/OpenStack_Project_Senlin_vertical.png
 sources:
diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml
index 6c192eb836..ae1a92c5f0 100644
--- a/senlin/templates/deployment-api.yaml
+++ b/senlin/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 "senlin_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/senlin/templates/deployment-conductor.yaml b/senlin/templates/deployment-conductor.yaml
index d60ada4937..0e6451e462 100644
--- a/senlin/templates/deployment-conductor.yaml
+++ b/senlin/templates/deployment-conductor.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 "senlin_conductor" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/senlin/templates/deployment-engine.yaml b/senlin/templates/deployment-engine.yaml
index 06ed7688b2..fdbaf28e4d 100644
--- a/senlin/templates/deployment-engine.yaml
+++ b/senlin/templates/deployment-engine.yaml
@@ -42,6 +42,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 "senlin_engine" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/senlin/templates/deployment-health-manager.yaml b/senlin/templates/deployment-health-manager.yaml
index e081c36544..dc0ca96ed7 100644
--- a/senlin/templates/deployment-health-manager.yaml
+++ b/senlin/templates/deployment-health-manager.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 "senlin_health_manager" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/senlin/values_overrides/annotations.yaml b/senlin/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..553e34bb08
--- /dev/null
+++ b/senlin/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    senlin_api:
+      another.tld/foo: "bar"
+...