Allow specifying pod annotations for only the Django deployment

kausaltech · Jul 24, 2024 · 45a3a29 · 45a3a29
1 parent 15c745c
commit 45a3a29
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/charts/django/Chart.yaml b/charts/django/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.1
+version: 0.6.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/django/templates/celery/beat/deployment.yaml b/charts/django/templates/celery/beat/deployment.yaml
@@ -22,7 +22,7 @@ spec:
         {{- include "django.labels" . | nindent 8 }}
         app.kubernetes.io/component: {{ .Values.celery.beat.componentName }}
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/env-configmap: {{ include (print $.Template.BasePath "/env-configmap.yaml") . | sha256sum }}

diff --git a/charts/django/templates/celery/flower/deployment.yaml b/charts/django/templates/celery/flower/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     type: {{ .Values.celery.flower.strategy }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.commonPodAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
         checksum/config: {{ include (print $.Template.BasePath "/env-configmap.yaml") . | sha256sum }}

diff --git a/charts/django/templates/celery/worker/deployment.yaml b/charts/django/templates/celery/worker/deployment.yaml
@@ -22,7 +22,7 @@ spec:
         {{- include "django.labels" . | nindent 8 }}
         app.kubernetes.io/component: {{ .Values.celery.worker.componentName }}
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/env-configmap: {{ include (print $.Template.BasePath "/env-configmap.yaml") . | sha256sum }}

diff --git a/charts/django/templates/deployment.yaml b/charts/django/templates/deployment.yaml
@@ -20,6 +20,9 @@ spec:
         {{- include "django.labels" . | nindent 8 }}
         app.kubernetes.io/component: {{ include "django.fullname" . }}
       annotations:
+        {{- with .Values.commonPodAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/django/values.yaml b/charts/django/values.yaml
@@ -217,6 +217,10 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+# Annotations for all deployments (django, celery, etc.)
+commonPodAnnotations: {}
+
+# Annotations for the Django pod only
 podAnnotations: {}
 
 podSecurityContext: {}