From a4a8b460ac6c83872a62f26574c469f4207ce175 Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Wed, 27 Mar 2024 09:20:45 +0200
Subject: [PATCH] Ironic: Enable custom annotations
Enable custom annotations for pods [deployments, daemonsets]
Change-Id: Ib2de0b5554db091b89f1c1eb242814f2859f9ee6
---
ironic/Chart.yaml | 2 +-
ironic/templates/deployment-api.yaml | 1 +
ironic/values_overrides/annotations.yaml | 9 +++++++++
releasenotes/notes/ironic.yaml | 1 +
4 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 ironic/values_overrides/annotations.yaml
diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index 9d47796701..fdb948cf47 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Ironic
name: ironic
-version: 0.2.10
+version: 0.2.11
home: https://docs.openstack.org/ironic/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
sources:
diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml
index 52dd785ba7..7d4b838747 100644
--- a/ironic/templates/deployment-api.yaml
+++ b/ironic/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 "ironic_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
affinity:
diff --git a/ironic/values_overrides/annotations.yaml b/ironic/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..01d8867904
--- /dev/null
+++ b/ironic/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+ pod:
+ default:
+ custom.tld/key: "value"
+ custom.tld/key2: "value2"
+ ironic_api:
+ another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index ade40153ee..b48e67a023 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -14,4 +14,5 @@ ironic:
- 0.2.8 Add helm3 hook supports to allow things like terraform deploys
- 0.2.9 Replace node-role.kubernetes.io/master with control-plane
- 0.2.10 Add standalone overrides
+ - 0.2.11 Enable custom annotations for Openstack pods
...