From 0f68af49eb9839800767bbf474baac3cb849fdff Mon Sep 17 00:00:00 2001 From: Tadas Sutkaitis Date: Mon, 1 Apr 2024 23:27:48 +0300 Subject: [PATCH] Placement: Enable custom annotations Enable custom annotations for pods [deployments, daemonsets] Change-Id: If6777ccf6ad201d13d762120a0f8d28b3a9e6878 --- placement/Chart.yaml | 2 +- placement/templates/deployment.yaml | 1 + placement/values_overrides/annotations.yaml | 9 +++++++++ releasenotes/notes/placement.yaml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 placement/values_overrides/annotations.yaml diff --git a/placement/Chart.yaml b/placement/Chart.yaml index 7863ca846e..8abaee0330 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Placement name: placement -version: 0.3.10 +version: 0.3.11 home: https://docs.openstack.org/placement/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png sources: diff --git a/placement/templates/deployment.yaml b/placement/templates/deployment.yaml index 37f02bc8d0..08450f36e5 100644 --- a/placement/templates/deployment.yaml +++ b/placement/templates/deployment.yaml @@ -45,6 +45,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 "placement" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }} {{ dict "envAll" $envAll "podName" "placement-api" "containerNames" (list "placement-api" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: serviceAccountName: {{ $serviceAccountName }} diff --git a/placement/values_overrides/annotations.yaml b/placement/values_overrides/annotations.yaml new file mode 100644 index 0000000000..46c5d881d3 --- /dev/null +++ b/placement/values_overrides/annotations.yaml @@ -0,0 +1,9 @@ +--- +annotations: + pod: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + designate_api: + another.tld/foo: "bar" +... diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml index 8fffa00c99..6dc745f542 100644 --- a/releasenotes/notes/placement.yaml +++ b/releasenotes/notes/placement.yaml @@ -33,4 +33,5 @@ placement: - 0.3.8 Add Ubuntu Jammy overrides - 0.3.9 Add 2023.2 Ubuntu Jammy overrides - 0.3.10 Add log_dir option for placement + - 0.3.11 Enable custom annotations for Openstack pods ...