allow annotations on helm dag pvc (#22261)

GitOrigin-RevId: a6fe387327f8901fbd23293352a3460c8b9047cf
kosteev · Sep 12, 2024 · f40657b · f40657b
1 parent 5821961
commit f40657b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 0 deletions.
diff --git a/chart/templates/dags-persistent-volume-claim.yaml b/chart/templates/dags-persistent-volume-claim.yaml
@@ -29,6 +29,10 @@ metadata:
     {{- with .Values.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+  annotations:
+    {{- if .Values.dags.persistence.annotations}}
+    {{- toYaml .Values.dags.persistence.annotations | nindent 4 }}
+    {{- end }}
 spec:
   accessModes: [{{ .Values.dags.persistence.accessMode | quote }}]
   resources:

diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -4202,6 +4202,14 @@
                             ],
                             "default": null
                         },
+                        "annotations": {
+                            "description": "Annotations for the dag PVC",
+                            "type": "object",
+                            "default": {},
+                            "additionalProperties": {
+                                "type": "string"
+                            }
+                        },
                         "subPath": {
                             "description": "Subpath within the PVC where dags are located.",
                             "type": [

diff --git a/tests/charts/test_dags_persistent_volume_claim.py b/tests/charts/test_dags_persistent_volume_claim.py
@@ -68,3 +68,44 @@ def test_should_set_pvc_details_correctly(self):
             "resources": {"requests": {"storage": "1G"}},
             "storageClassName": "MyStorageClass",
         } == jmespath.search("spec", docs[0])
+
+    def test_single_annotation(self):
+        docs = render_chart(
+            values={
+                "dags": {
+                    "persistence": {
+                        "enabled": True,
+                        "size": "1G",
+                        "existingClaim": None,
+                        "storageClassName": "MyStorageClass",
+                        "accessMode": "ReadWriteMany",
+                        "annotations": {"key": "value"},
+                    }
+                }
+            },
+            show_only=["templates/dags-persistent-volume-claim.yaml"],
+        )
+
+        annotations = jmespath.search("metadata.annotations", docs[0])
+        assert "value" == annotations.get("key")
+
+    def test_multiple_annotations(self):
+        docs = render_chart(
+            values={
+                "dags": {
+                    "persistence": {
+                        "enabled": True,
+                        "size": "1G",
+                        "existingClaim": None,
+                        "storageClassName": "MyStorageClass",
+                        "accessMode": "ReadWriteMany",
+                        "annotations": {"key": "value", "key-two": "value-two"},
+                    }
+                }
+            },
+            show_only=["templates/dags-persistent-volume-claim.yaml"],
+        )
+
+        annotations = jmespath.search("metadata.annotations", docs[0])
+        assert "value" == annotations.get("key")
+        assert "value-two" == annotations.get("key-two")