From 1f073e5352ea1603de5018bddb58051f8b365ab9 Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Thu, 7 Mar 2024 22:26:27 +0200
Subject: [PATCH] Barbican: Enable custom annotations

Enable custom annotations for pods [deployments, daemonsets]

Change-Id: I88e692fcf63a4606fde7ec7ecaeacfdbf90c9f09
---
 barbican/Chart.yaml                        | 2 +-
 barbican/templates/deployment-api.yaml     | 1 +
 barbican/values_overrides/annotations.yaml | 9 +++++++++
 releasenotes/notes/barbican.yaml           | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 barbican/values_overrides/annotations.yaml

diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 1911c5c2b4..b6dd1e349b 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.3.8
+version: 0.3.9
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml
index de26c3168c..d777f42fd0 100644
--- a/barbican/templates/deployment-api.yaml
+++ b/barbican/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 "barbican_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "barbican-api" "containerNames" (list "init" "barbican-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "barbican" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
diff --git a/barbican/values_overrides/annotations.yaml b/barbican/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..dd5754abf1
--- /dev/null
+++ b/barbican/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    barbican_api:
+      another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index c24de3b72c..6dfa9edf3f 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -32,4 +32,5 @@ barbican:
   - 0.3.6 Add 2023.2 Ubuntu Jammy overrides
   - 0.3.7 Fix TLS connection to rabbitmq, and generate barbican certificate
   - 0.3.8 Make barbican TLS configuration granular
+  - 0.3.9 Enable custom annotations for Openstack pods
 ...