From 95717ec228ccca9a295eb3761f8ed9fa5c4193bb Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Mon, 20 Feb 2023 10:57:45 -0500
Subject: [PATCH] Add bitnami style podAnnotations

---
 templates/_tplvalues.tpl         | 12 ++++++++++++
 templates/beat/deployment.yaml   |  3 +++
 templates/flower/deployment.yaml |  3 +++
 templates/web/deployment.yaml    |  3 +++
 templates/worker/deployment.yaml |  3 +++
 values.yaml                      |  4 ++++
 6 files changed, 28 insertions(+)
 create mode 100644 templates/_tplvalues.tpl

diff --git a/templates/_tplvalues.tpl b/templates/_tplvalues.tpl
new file mode 100644
index 0000000..50f1c91
--- /dev/null
+++ b/templates/_tplvalues.tpl
@@ -0,0 +1,12 @@
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "common.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/templates/beat/deployment.yaml b/templates/beat/deployment.yaml
index ccea67f..75cce84 100644
--- a/templates/beat/deployment.yaml
+++ b/templates/beat/deployment.yaml
@@ -19,6 +19,9 @@ spec:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
+        {{- if .Values.beat.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.beat.podAnnotations "context" $ ) | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: beat
diff --git a/templates/flower/deployment.yaml b/templates/flower/deployment.yaml
index 05f1229..8af53e3 100644
--- a/templates/flower/deployment.yaml
+++ b/templates/flower/deployment.yaml
@@ -18,6 +18,9 @@ spec:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
+        {{- if .Values.flower.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: flower
diff --git a/templates/web/deployment.yaml b/templates/web/deployment.yaml
index e430eb3..9a232bf 100644
--- a/templates/web/deployment.yaml
+++ b/templates/web/deployment.yaml
@@ -19,6 +19,9 @@ spec:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
+        {{- if .Values.web.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.web.podAnnotations "context" $ ) | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: web
diff --git a/templates/worker/deployment.yaml b/templates/worker/deployment.yaml
index 5e5cf1f..736cebd 100644
--- a/templates/worker/deployment.yaml
+++ b/templates/worker/deployment.yaml
@@ -18,6 +18,9 @@ spec:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
+        {{- if .Values.worker.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.worker.podAnnotations "context" $ ) | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: worker
diff --git a/values.yaml b/values.yaml
index 612bda6..7f6ad0c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -45,6 +45,7 @@ web:
       memory: 128Mi
   nodeSelector: {}
   tolerations: []
+  podAnnotations: {}
   affinity: {}
     # podAntiAffinity:
     #   preferredDuringSchedulingIgnoredDuringExecution:
@@ -105,6 +106,7 @@ worker:
       memory: 128Mi
   nodeSelector: {}
   tolerations: []
+  podAnnotations: {}
   affinity: {}
 
 beat:
@@ -118,6 +120,7 @@ beat:
       memory: 90Mi
   nodeSelector: {}
   tolerations: []
+  podAnnotations: {}
   affinity: {}
 
 flower:
@@ -131,6 +134,7 @@ flower:
       memory: 256Mi
   nodeSelector: {}
   tolerations: []
+  podAnnotations: {}
   affinity: {}
   service:
     type: ClusterIP