add annotations to configmaps

chart/templates/configmaps/statsd-configmap.yaml

@@ -29,9 +29,13 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.statsd.configMapAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 data:
   mappings.yml: |-
     {{- if .Values.statsd.overrideMappings }}

chart/templates/configmaps/webserver-configmap.yaml

@@ -29,9 +29,13 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.webserver.configMapAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 data:
   webserver_config.py: |-
     {{- tpl .Values.webserver.webserverConfig . | nindent 4 }}

chart/values.schema.json

@@ -3509,6 +3509,14 @@
                         "my-webserver-configmap"
                     ]
                 },
+                "configMapAnnotations": {
+                    "description": "Annotations to add to the webserver configmap",
+                    "type": "object",
+                    "default": {},
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
                 "service": {
                     "description": "Webserver Service configuration.",
                     "type": "object",
@@ -4253,6 +4261,14 @@
                         "type": "string"
                     }
                 },
+                "configMapAnnotations": {
+                    "description": "Annotations to add to the StatsD configmap.",
+                    "type": "object",
+                    "default": {},
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
                 "annotations": {
                     "description": "Annotations to add to the StatsD deployment.",
                     "type": "object",

chart/values.yaml

@@ -1066,6 +1066,8 @@ webserver:
   #   CSRF_ENABLED = True
   webserverConfigConfigMapName: ~
 
+  configMapAnnotations: {}
+
   service:
     type: ClusterIP
     ## service annotations
@@ -1524,6 +1526,8 @@ statsd:
 
   podAnnotations: {}
 
+  configMapAnnotations: {}
+
 # PgBouncer settings
 pgbouncer:
   # Enable PgBouncer

tests/charts/test_statsd.py

@@ -223,6 +223,17 @@ def test_statsd_args_can_be_overridden(self):
 
         assert jmespath.search("spec.template.spec.containers[0].args", docs[0]) == args
 
+    def test_should_add_statsd_configmap_annotations(self):
+        docs = render_chart(
+            values={
+                "statsd": {"configMapAnnotations": {"test_annotation": "test_annotation_value"}},
+            },
+            show_only=["templates/configmaps/statsd-configmap.yaml"],
+        )
+
+        assert "annotations" in jmespath.search("metadata", docs[0])
+        assert jmespath.search("metadata.annotations", docs[0])["test_annotation"] == "test_annotation_value"
+
     def test_should_add_component_specific_annotations(self):
         docs = render_chart(
             values={

tests/charts/test_webserver.py

@@ -838,6 +838,20 @@ def test_webserver_config_configmap(self):
             == jmespath.search('data."webserver_config.py"', docs[0]).strip()
         )
 
+    def test_webserver_configmap_annotation(self):
+        docs = render_chart(
+            values={
+                "webserver": {
+                    "webserverConfig": "CSRF_ENABLED = True  # {{ .Release.Name }}",
+                    "configMapAnnotations": {"test_annotation": "test_annotation_value"},
+                },
+            },
+            show_only=["templates/configmaps/webserver-configmap.yaml"],
+        )
+
+        assert "annotations" in jmespath.search("metadata", docs[0])
+        assert jmespath.search("metadata.annotations", docs[0])["test_annotation"] == "test_annotation_value"
+
 
 class TestWebserverNetworkPolicy:
     def test_off_by_default(self):