From 08a8e2b0cf3e415ec1f211547ba66238d00b64ba Mon Sep 17 00:00:00 2001
From: Craig Rueda <craig@craigrueda.com>
Date: Thu, 24 Jul 2025 04:29:09 -0700
Subject: [PATCH] Add support for additional annotations in Kubernetes resource
 templates (#359)

* Add support for additional annotations in Kubernetes resource templates

* Bumping changelog

* Fixing version

* Reverting version bumps
---
 charts/qdrant/templates/configmap.yaml                 | 4 ++++
 charts/qdrant/templates/ingress.yaml                   | 9 +++++++--
 charts/qdrant/templates/pdb.yaml                       | 4 ++++
 charts/qdrant/templates/secret.yaml                    | 4 ++++
 charts/qdrant/templates/service-headless.yaml          | 9 +++++++--
 charts/qdrant/templates/service.yaml                   | 9 +++++++--
 charts/qdrant/templates/serviceaccount.yaml            | 9 +++++++--
 charts/qdrant/templates/servicemonitor.yaml            | 4 ++++
 charts/qdrant/templates/statefulset.yaml               | 4 ++++
 charts/qdrant/templates/tests/test-db-interaction.yaml | 6 ++++++
 charts/qdrant/values.yaml                              | 2 ++
 11 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/charts/qdrant/templates/configmap.yaml b/charts/qdrant/templates/configmap.yaml
index a81fffa..e9ac267 100644
--- a/charts/qdrant/templates/configmap.yaml
+++ b/charts/qdrant/templates/configmap.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "qdrant.fullname" . }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
+{{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 data:
   initialize.sh: |
     #!/bin/sh
diff --git a/charts/qdrant/templates/ingress.yaml b/charts/qdrant/templates/ingress.yaml
index 47d769c..ffa4c86 100644
--- a/charts/qdrant/templates/ingress.yaml
+++ b/charts/qdrant/templates/ingress.yaml
@@ -8,10 +8,15 @@ metadata:
     {{- with .Values.ingress.additionalLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.ingress.annotations }}
+{{- if or .Values.ingress.annotations .Values.additionalAnnotations }}
   annotations:
+{{- with .Values.additionalAnnotations }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+{{- end }}
+{{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end }}
 spec:
   {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName }}
diff --git a/charts/qdrant/templates/pdb.yaml b/charts/qdrant/templates/pdb.yaml
index 60e91e7..9233542 100644
--- a/charts/qdrant/templates/pdb.yaml
+++ b/charts/qdrant/templates/pdb.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ include "qdrant.fullname" . }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
+{{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   {{- with  .Values.podDisruptionBudget.maxUnavailable}}
   maxUnavailable: {{ . }}
diff --git a/charts/qdrant/templates/secret.yaml b/charts/qdrant/templates/secret.yaml
index bbc8edd..c9e30bf 100644
--- a/charts/qdrant/templates/secret.yaml
+++ b/charts/qdrant/templates/secret.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ include "qdrant.fullname" . }}-apikey
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
+{{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 data:
 {{ include "qdrant.secret" . | indent 2}}
 {{- end }}
diff --git a/charts/qdrant/templates/service-headless.yaml b/charts/qdrant/templates/service-headless.yaml
index 238ed49..b417b22 100644
--- a/charts/qdrant/templates/service-headless.yaml
+++ b/charts/qdrant/templates/service-headless.yaml
@@ -8,9 +8,14 @@ metadata:
 {{- with .Values.service.additionalLabels }}
 {{- toYaml . | nindent 4 }}
 {{- end }}
-{{- if .Values.service.annotations }}
+{{- if or .Values.service.annotations .Values.additionalAnnotations }}
   annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
+{{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 {{- end }}
 spec:
   clusterIP: None
diff --git a/charts/qdrant/templates/service.yaml b/charts/qdrant/templates/service.yaml
index b56042b..797becf 100644
--- a/charts/qdrant/templates/service.yaml
+++ b/charts/qdrant/templates/service.yaml
@@ -7,9 +7,14 @@ metadata:
 {{- with .Values.service.additionalLabels }}
 {{- toYaml . | nindent 4 }}
 {{- end }}
-{{- if .Values.service.annotations }}
+{{- if or .Values.service.annotations .Values.additionalAnnotations }}
   annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
+{{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 {{- end }}
 spec:
   type: {{ .Values.service.type | default "ClusterIP" }}
diff --git a/charts/qdrant/templates/serviceaccount.yaml b/charts/qdrant/templates/serviceaccount.yaml
index 0a6b864..721a5b5 100644
--- a/charts/qdrant/templates/serviceaccount.yaml
+++ b/charts/qdrant/templates/serviceaccount.yaml
@@ -2,9 +2,14 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "qdrant.fullname" . }}
-{{- if .Values.serviceAccount.annotations }}
+{{- if or .Values.serviceAccount.annotations .Values.additionalAnnotations }}
   annotations:
-{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
+{{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.serviceAccount.annotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 {{- end }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
\ No newline at end of file
diff --git a/charts/qdrant/templates/servicemonitor.yaml b/charts/qdrant/templates/servicemonitor.yaml
index 6127db5..e1631e7 100644
--- a/charts/qdrant/templates/servicemonitor.yaml
+++ b/charts/qdrant/templates/servicemonitor.yaml
@@ -8,6 +8,10 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
   name: {{ include "qdrant.fullname" . }}
+{{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   endpoints:
     - honorLabels: true
diff --git a/charts/qdrant/templates/statefulset.yaml b/charts/qdrant/templates/statefulset.yaml
index f197bc5..c0aa419 100644
--- a/charts/qdrant/templates/statefulset.yaml
+++ b/charts/qdrant/templates/statefulset.yaml
@@ -7,6 +7,10 @@ metadata:
 {{- with .Values.additionalLabels }}
 {{- toYaml . | nindent 4 }}
 {{- end }}
+{{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   podManagementPolicy: {{ .Values.podManagementPolicy }}
diff --git a/charts/qdrant/templates/tests/test-db-interaction.yaml b/charts/qdrant/templates/tests/test-db-interaction.yaml
index 93ea001..780457c 100644
--- a/charts/qdrant/templates/tests/test-db-interaction.yaml
+++ b/charts/qdrant/templates/tests/test-db-interaction.yaml
@@ -8,6 +8,9 @@ metadata:
     {{- include "qdrant.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+{{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   containers:
     - name: test-script
@@ -45,6 +48,9 @@ metadata:
     {{- include "qdrant.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+{{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 data:
   entrypoint.sh: |
     #!/bin/bash
diff --git a/charts/qdrant/values.yaml b/charts/qdrant/values.yaml
index 12da648..0174b0e 100644
--- a/charts/qdrant/values.yaml
+++ b/charts/qdrant/values.yaml
@@ -82,6 +82,8 @@ startupProbe:
   successThreshold: 1
 
 additionalLabels: {}
+# additionalAnnotations will be added to all top-level resources (StatefulSet, Service, ConfigMap, etc.)
+additionalAnnotations: {}
 podAnnotations: {}
 podLabels: {}