make cli-install feature optional (#2072)

astronomer · Dec 5, 2023 · 3e1468b · 3e1468b
1 parent 0ea0eb3
commit 3e1468b
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 1 deletion.
diff --git a/charts/astronomer/templates/cli-install/cli-install-configmap.yaml b/charts/astronomer/templates/cli-install/cli-install-configmap.yaml
@@ -1,6 +1,7 @@
 ################################
 ## Install ConfigMap
 #################################
+{{- if .Values.install.cliEnabled }}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -24,3 +25,4 @@ data:
 
     DOWNLOADER="https://raw.githubusercontent.com/astronomer/astro-cli/main/godownloader.sh"
     curl -sL -o- "${DOWNLOADER}" | bash -s -- -b /usr/local/bin "$TAG"
+{{ end }}
diff --git a/charts/astronomer/templates/cli-install/cli-install-deployment.yaml b/charts/astronomer/templates/cli-install/cli-install-deployment.yaml
@@ -1,6 +1,7 @@
 ################################
 ## Install Deployment
 #################################
+{{- if .Values.install.cliEnabled }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -59,3 +60,4 @@ spec:
             items:
               - key: install.sh
                 path: install.sh
+{{ end }}
diff --git a/charts/astronomer/templates/cli-install/cli-install-networkpolicy.yaml b/charts/astronomer/templates/cli-install/cli-install-networkpolicy.yaml
@@ -1,7 +1,7 @@
 ################################
 ## CLI Install NetworkPolicy
 ################################
-{{- if .Values.global.networkPolicy.enabled }}
+{{- if and .Values.install.cliEnabled  .Values.global.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:

diff --git a/charts/astronomer/templates/cli-install/cli-install-service.yaml b/charts/astronomer/templates/cli-install/cli-install-service.yaml
@@ -1,6 +1,7 @@
 ################################
 ## Install Service
 #################################
+{{- if .Values.install.cliEnabled }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -23,3 +24,4 @@ spec:
       protocol: TCP
       name: install-http
       appProtocol: tcp
+{{- end }}
diff --git a/charts/astronomer/templates/ingress.yaml b/charts/astronomer/templates/ingress.yaml
@@ -103,6 +103,7 @@ spec:
               name: {{ .Release.Name }}-registry
               port:
                 name: registry-http
+{{- if .Values.install.cliEnabled }}
   - host: install.{{ .Values.global.baseDomain }}
     http:
       paths:
@@ -113,5 +114,6 @@ spec:
               name: {{ .Release.Name }}-cli-install
               port:
                 name: install-http
+{{- end -}}
   {{- end -}}
 {{- end }}
diff --git a/charts/astronomer/values.yaml b/charts/astronomer/values.yaml
@@ -423,6 +423,7 @@ registry:
   logLevel: info
 
 install:
+  cliEnabled: true
   resources: {}
   cliVersion: 0.29
   #  limits:

diff --git a/tests/chart_tests/test_astronomer_cli_install.py b/tests/chart_tests/test_astronomer_cli_install.py
@@ -0,0 +1,55 @@
+from tests.chart_tests.helm_template_generator import render_chart
+import pytest
+from tests import supported_k8s_versions
+import jmespath
+
+
+@pytest.mark.parametrize(
+    "kube_version",
+    supported_k8s_versions,
+)
+class TestAstronomerCliInstall:
+    def test_astronomer_cli_install_default(self, kube_version):
+        """Test that helm renders a good deployment template for
+        astronomer/cli-install."""
+        docs = render_chart(
+            kube_version=kube_version,
+            show_only=[
+                "charts/astronomer/templates/cli-install/cli-install-configmap.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-deployment.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-networkpolicy.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-service.yaml",
+                "charts/astronomer/templates/ingress.yaml",
+            ],
+        )
+
+        assert len(docs) == 5
+        assert "install.example.com" in jmespath.search("spec.rules[*].host", docs[4])
+
+    def test_astronomer_cli_install_disabled(self, kube_version):
+        """Test that cli install service is disabled."""
+        docs = render_chart(
+            kube_version=kube_version,
+            values={"astronomer": {"install": {"cliEnabled": False}}},
+            show_only=[
+                "charts/astronomer/templates/cli-install/cli-install-configmap.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-deployment.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-networkpolicy.yaml",
+                "charts/astronomer/templates/cli-install/cli-install-service.yaml",
+            ],
+        )
+
+        assert len(docs) == 0
+
+    def test_astronomer_cli_install_ingress_disabled(self, kube_version):
+        """Test that cli install service ingress is disabled."""
+        docs = render_chart(
+            kube_version=kube_version,
+            values={"astronomer": {"install": {"cliEnabled": False}}},
+            show_only=["charts/astronomer/templates/ingress.yaml"],
+        )
+
+        assert len(docs) == 1
+        assert "install.example.com" not in jmespath.search(
+            "spec.rules[*].host", docs[0]
+        )