From bb049d9ee19682fbf1260017d1821a129c89a92b Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Mon, 1 Apr 2024 23:22:39 +0300
Subject: [PATCH] Octavia: Enable custom annotations

Enable custom annotations for pods [deployments, daemonsets]

Change-Id: I41df99691bf80878bb393f0b5e131cfdba890d6a
---
 octavia/Chart.yaml                              | 2 +-
 octavia/templates/daemonset-health-manager.yaml | 1 +
 octavia/templates/deployment-api.yaml           | 1 +
 octavia/templates/deployment-housekeeping.yaml  | 1 +
 octavia/templates/deployment-worker.yaml        | 1 +
 octavia/values_overrides/annotations.yaml       | 9 +++++++++
 releasenotes/notes/octavia.yaml                 | 1 +
 7 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 octavia/values_overrides/annotations.yaml

diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml
index 54ed0bb928..7c20f644da 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 0.2.11
+version: 0.2.12
 home: https://docs.openstack.org/octavia/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
 sources:
diff --git a/octavia/templates/daemonset-health-manager.yaml b/octavia/templates/daemonset-health-manager.yaml
index ff935af3e6..9b986219ec 100644
--- a/octavia/templates/daemonset-health-manager.yaml
+++ b/octavia/templates/daemonset-health-manager.yaml
@@ -45,6 +45,7 @@ spec:
       annotations:
         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 "octavia_health_manager" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       dnsPolicy: ClusterFirstWithHostNet
diff --git a/octavia/templates/deployment-api.yaml b/octavia/templates/deployment-api.yaml
index da15972429..8029d5bdda 100644
--- a/octavia/templates/deployment-api.yaml
+++ b/octavia/templates/deployment-api.yaml
@@ -44,6 +44,7 @@ spec:
       annotations:
         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 "octavia_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
diff --git a/octavia/templates/deployment-housekeeping.yaml b/octavia/templates/deployment-housekeeping.yaml
index 39903b6bab..95b42271b0 100644
--- a/octavia/templates/deployment-housekeeping.yaml
+++ b/octavia/templates/deployment-housekeeping.yaml
@@ -44,6 +44,7 @@ spec:
       annotations:
         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 "octavia_housekeeping" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       dnsPolicy: ClusterFirstWithHostNet
diff --git a/octavia/templates/deployment-worker.yaml b/octavia/templates/deployment-worker.yaml
index 54cf68d7d0..61da197422 100644
--- a/octavia/templates/deployment-worker.yaml
+++ b/octavia/templates/deployment-worker.yaml
@@ -44,6 +44,7 @@ spec:
       annotations:
         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 "octavia_worker" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       dnsPolicy: ClusterFirstWithHostNet
diff --git a/octavia/values_overrides/annotations.yaml b/octavia/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..8cd37d633f
--- /dev/null
+++ b/octavia/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    octavia_api:
+      another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml
index 2449ffeaa4..c3c3abd3cd 100644
--- a/releasenotes/notes/octavia.yaml
+++ b/releasenotes/notes/octavia.yaml
@@ -15,4 +15,5 @@ octavia:
   - 0.2.9 Use default timeout and retry configs for haproxy_amphora
   - 0.2.10 Fix generating health_manager Role and RoleBinding
   - 0.2.11 Uses uWSGI for API service
+  - 0.2.12 Enable custom annotations for Openstack pods
 ...