add custom ca volume on right indent (#2091)

* add custom ca volume on right indent * updated registry ca private * fix registry tests
astronomer · Jan 25, 2024 · 1bbf1f3 · 1bbf1f3
1 parent d55d61b
commit 1bbf1f3
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/charts/astronomer/templates/registry/registry-statefulset.yaml b/charts/astronomer/templates/registry/registry-statefulset.yaml
@@ -125,14 +125,14 @@ spec:
         - name: certificate
           secret:
             secretName: {{ .Values.global.tlsSecret }}
+        {{ include "custom_ca_volumes" . | indent 8  }}
         {{- if and .Values.registry.gcs.enabled .Values.registry.gcs.useKeyfile }}
         {{- include "registry.gcsVolume" . | indent 8 }}
         {{- end }}
   {{- if or (not .Values.registry.persistence.enabled) (.Values.registry.gcs.enabled) (.Values.registry.azure.enabled) (.Values.registry.s3.enabled)}}
         - name: data
           emptyDir: {}
   {{- else }}
-        {{ include "custom_ca_volumes" . | indent 8  }}
   volumeClaimTemplates:
     - metadata:
         name: data

diff --git a/tests/chart_tests/test_registry_statefulset.py b/tests/chart_tests/test_registry_statefulset.py
@@ -127,11 +127,15 @@ def test_registry_privateca_enabled(self, kube_version):
                 "charts/astronomer/templates/registry/registry-statefulset.yaml"
             ],
         )
-        search_result = jmespath.search(
+        volume_mount_search_result = jmespath.search(
             "spec.template.spec.containers[*].volumeMounts[?name == 'private-root-ca']",
             docs[0],
         )
-        expected_result = [
+        volume_search_result = jmespath.search(
+            "spec.template.spec.volumes[?name == 'private-root-ca']",
+            docs[0],
+        )
+        expected_volume_mounts_result = [
             [
                 {
                     "mountPath": "/usr/local/share/ca-certificates/private-root-ca.pem",
@@ -140,7 +144,51 @@ def test_registry_privateca_enabled(self, kube_version):
                 }
             ]
         ]
-        assert search_result == expected_result
+        expected_volume_result = [
+            {"name": "private-root-ca", "secret": {"secretName": "private-root-ca"}}
+        ]
+
+        assert docs[0]["kind"] == "StatefulSet"
+        assert volume_mount_search_result == expected_volume_mounts_result
+        assert volume_search_result == expected_volume_result
+        assert {"name": "UPDATE_CA_CERTS", "value": "true"} in docs[0]["spec"][
+            "template"
+        ]["spec"]["containers"][0]["env"]
+
+    def test_registry_privateca_enabled_with_external_backend(self, kube_version):
+        docs = render_chart(
+            kube_version=kube_version,
+            values={
+                "global": {"privateCaCerts": ["private-root-ca"]},
+                "astronomer": {"registry": {"s3": {"enabled": True}}},
+            },
+            show_only=[
+                "charts/astronomer/templates/registry/registry-statefulset.yaml"
+            ],
+        )
+        volume_mount_search_result = jmespath.search(
+            "spec.template.spec.containers[*].volumeMounts[?name == 'private-root-ca']",
+            docs[0],
+        )
+        volume_search_result = jmespath.search(
+            "spec.template.spec.volumes[?name == 'private-root-ca']",
+            docs[0],
+        )
+        expected_volume_mounts_result = [
+            [
+                {
+                    "mountPath": "/usr/local/share/ca-certificates/private-root-ca.pem",
+                    "name": "private-root-ca",
+                    "subPath": "cert.pem",
+                }
+            ]
+        ]
+        expected_volume_result = [
+            {"name": "private-root-ca", "secret": {"secretName": "private-root-ca"}}
+        ]
+        assert docs[0]["kind"] == "Deployment"
+        assert volume_mount_search_result == expected_volume_mounts_result
+        assert volume_search_result == expected_volume_result
         assert {"name": "UPDATE_CA_CERTS", "value": "true"} in docs[0]["spec"][
             "template"
         ]["spec"]["containers"][0]["env"]