SWAT-59 - ingressClassName support

.gitignore

@@ -1,5 +1,6 @@
 **kubeconfig**
 **pycache**
+*.egg-info/
 *.swp
 *.tgz
 .DS_Store
@@ -10,9 +11,11 @@
 /secrets
 /test-results
 backup
+build/
 certs
 charts
 dev-account.json
+dist/
 kubeconfig
 letsencrypt*
 repo_state.log

.python-version

@@ -0,0 +1 @@
+3.14.2

bin/install-ci-tools

@@ -3,6 +3,7 @@ set -e
 
 KIND_VERSION="0.31.0" # https://github.com/kubernetes-sigs/kind/releases
 HELM_VERSION="3.20.0" # https://github.com/helm/helm/releases
+UV_VERSION="0.10.7" # https://github.com/astral-sh/uv/releases
 
 # Determine the platform we are running on
 OS=$(uname | tr '[:upper:]' '[:lower:]')
@@ -46,4 +47,12 @@ else
   chmod +x ./kubectl
 fi
 
+echo "Installing uv version ${UV_VERSION}..."
+if [[ -f /tmp/bin/uv ]]; then
+  echo "Already installed in /tmp/bin. Skipping!"
+else
+  curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/uv-installer.sh | sh
+  mv "$HOME/.local/bin/uv" /tmp/bin/
+fi
+
 cd "$CURRENT_DIR"

pyproject.toml

@@ -1,4 +1,8 @@
 # https://www.python.org/dev/peps/pep-0518/#file-format
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "airflow-chart-dev-env"
 description = "astronomer airflow-chart development environment"
@@ -26,6 +30,9 @@ dependencies = [
     "yamllint>=1.37.1",
 ]
 
+[tool.setuptools]
+packages = []
+
 # https://docs.astral.sh/ruff/settings/
 [tool.ruff]
 line-length = 132

templates/ingress.yaml

@@ -31,6 +31,9 @@ metadata:
   {{- end }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   tls:
     - secretName: {{ .Values.ingress.tlsSecretName | default "~" }}
       hosts:
@@ -117,6 +120,9 @@ metadata:
   {{- end }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   tls:
     - secretName: {{ .Values.ingress.tlsSecretName | default "~" }}
       hosts:
@@ -189,6 +195,9 @@ metadata:
   {{- end }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   tls:
     - secretName: {{ .Values.ingress.tlsSecretName | default "~" }}
       hosts:

tests/chart/test_ingress.py

@@ -131,3 +131,80 @@ def test_airflow_ingress_with_dag_server_ingress_annotation_and_tls_secret(self,
 
         assert ingressAnnotations == docs[1]["metadata"]["annotations"]
         assert docs[1]["spec"]["tls"][0]["secretName"] == tls_secret_name
+
+    def test_airflow_ingress_class_name(self, kube_version):
+        """Test airflow ingress with ingressClassName."""
+        docs = render_chart(
+            kube_version=kube_version,
+            show_only="templates/ingress.yaml",
+            values={
+                "ingress": {
+                    "enabled": True,
+                    "baseDomain": "example.com",
+                    "ingressClassName": "nginx",
+                }
+            },
+        )
+        assert len(docs) == 1
+        doc = docs[0]
+        assert "Ingress" == doc["kind"]
+        assert "nginx" == doc["spec"]["ingressClassName"]
+
+    def test_airflow_ingress_class_name_with_celery_executor(self, kube_version):
+        """Test airflow and flower ingress with ingressClassName and CeleryExecutor."""
+        docs = render_chart(
+            kube_version=kube_version,
+            show_only="templates/ingress.yaml",
+            values={
+                "airflow": {"executor": "CeleryExecutor"},
+                "ingress": {
+                    "enabled": True,
+                    "baseDomain": "example.com",
+                    "ingressClassName": "nginx-internal",
+                },
+            },
+        )
+        assert len(docs) == 2
+
+        # Airflow ingress
+        assert "Ingress" == docs[0]["kind"]
+        assert "nginx-internal" == docs[0]["spec"]["ingressClassName"]
+
+        # Flower ingress
+        assert "Ingress" == docs[1]["kind"]
+        assert "nginx-internal" == docs[1]["spec"]["ingressClassName"]
+
+    def test_airflow_ingress_class_name_with_dag_server(self, kube_version):
+        """Test dag server ingress with ingressClassName."""
+        docs = render_chart(
+            kube_version=kube_version,
+            show_only="templates/ingress.yaml",
+            values={
+                "ingress": {
+                    "baseDomain": "example.com",
+                    "ingressClassName": "custom-ingress",
+                },
+                "dagDeploy": {"enabled": True},
+            },
+        )
+
+        assert len(docs) == 1
+        assert docs[0]["metadata"]["name"] == "release-name-dag-server-ingress"
+        assert "custom-ingress" == docs[0]["spec"]["ingressClassName"]
+
+    def test_airflow_ingress_class_name_not_set(self, kube_version):
+        """Test airflow ingress without ingressClassName (default behavior)."""
+        docs = render_chart(
+            kube_version=kube_version,
+            show_only="templates/ingress.yaml",
+            values={
+                "ingress": {
+                    "enabled": True,
+                    "baseDomain": "example.com",
+                }
+            },
+        )
+        assert len(docs) == 1
+        doc = docs[0]
+        assert "Ingress" == doc["kind"]
+        assert "ingressClassName" not in doc["spec"]

values.yaml

@@ -590,6 +590,9 @@ ingress:
   # Enable ingress resource
   enabled: false
 
+  # Enables using a specific ingress class for the deployment. If not set, will default to the cluster default.
+  ingressClassName: ~
+
   # Enable for cert-manager or kube-lego
   acme: false