From ccfffccbbc0c3bcde1bdb752dae0decadf622364 Mon Sep 17 00:00:00 2001
From: Tadas Sutkaitis <tadasas@gmail.com>
Date: Tue, 26 Mar 2024 21:38:09 +0200
Subject: [PATCH] Glance: Enable custom annotations
Enable custom annotations for pods [deployments, daemonsets]
Change-Id: I7f48eebec0050a614d393054ac2ac0b26c40a4ee
---
glance/Chart.yaml | 2 +-
glance/templates/deployment-api.yaml | 1 +
glance/values_overrides/annotations.yaml | 9 +++++++++
releasenotes/notes/glance.yaml | 1 +
4 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 glance/values_overrides/annotations.yaml
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index d785a1ebab..ad60809895 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Glance
name: glance
-version: 0.4.17
+version: 0.4.18
home: https://docs.openstack.org/glance/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
sources:
diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index bfe004978f..10d691e445 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -73,6 +73,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 "glance_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
{{ dict "envAll" $envAll "podName" "glance-api" "containerNames" ( list "glance-perms" "glance-api" "init" "nginx" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
diff --git a/glance/values_overrides/annotations.yaml b/glance/values_overrides/annotations.yaml
new file mode 100644
index 0000000000..f7bd672769
--- /dev/null
+++ b/glance/values_overrides/annotations.yaml
@@ -0,0 +1,9 @@
+---
+annotations:
+ pod:
+ default:
+ custom.tld/key: "value"
+ custom.tld/key2: "value2"
+ glance_api:
+ another.tld/foo: "bar"
+...
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index f8f8c28d14..a37310f3d4 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -51,4 +51,5 @@ glance:
- 0.4.15 Add 2023.2 Ubuntu Jammy overrides
- 0.4.16 Use --region option to prevent OS_SWIFT_ENDPOINT_PREFIX is broken in storage-init.sh
- 0.4.17 Update Ceph images to Jammy and Reef 18.2.1
+ - 0.4.18 Enable custom annotations for Openstack pods
...