From 07a2a814de74e8a1a2169ca20b57aa12ed9fcdcd Mon Sep 17 00:00:00 2001 From: Tadas Sutkaitis Date: Thu, 28 Mar 2024 09:47:23 +0200 Subject: [PATCH] Magnum: Enable custom annotations Enable custom annotations for pods [deployments, daemonsets] Change-Id: I8ee3cb362380104639f7134571e5839ddc3d50b8 --- magnum/Chart.yaml | 2 +- magnum/templates/deployment-api.yaml | 1 + magnum/values_overrides/annotations.yaml | 9 +++++++++ releasenotes/notes/magnum.yaml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 magnum/values_overrides/annotations.yaml diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml index dd3110fcd0..f8e13554c1 100644 --- a/magnum/Chart.yaml +++ b/magnum/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Magnum name: magnum -version: 0.2.10 +version: 0.2.11 home: https://docs.openstack.org/magnum/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Magnum/OpenStack_Project_Magnum_vertical.png sources: diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 9eb4967f8c..85d603b3f0 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/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 "magnum_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }} spec: serviceAccountName: {{ $serviceAccountName }} affinity: diff --git a/magnum/values_overrides/annotations.yaml b/magnum/values_overrides/annotations.yaml new file mode 100644 index 0000000000..313524e874 --- /dev/null +++ b/magnum/values_overrides/annotations.yaml @@ -0,0 +1,9 @@ +--- +annotations: + pod: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + magnum_api: + another.tld/foo: "bar" +... diff --git a/releasenotes/notes/magnum.yaml b/releasenotes/notes/magnum.yaml index 16531ab70f..93606fc1e7 100644 --- a/releasenotes/notes/magnum.yaml +++ b/releasenotes/notes/magnum.yaml @@ -14,4 +14,5 @@ magnum: - 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 service + - 0.2.11 Enable custom annotations for Openstack pods ...