feat(helm): bump minimum supported kubernetes version to 0.19 (#7925)

dagster-io · May 18, 2022 · fb025dc · fb025dc
1 parent 205d811
commit fb025dc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 167 deletions.
diff --git a/helm/dagster/Chart.yaml b/helm/dagster/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: dagster
 version: 0.0.1-dev
-kubeVersion: ">= 1.18.0-0"
+kubeVersion: ">= 1.19.0-0"
 description: The data orchestration platform built for productivity.
 type: application
 keywords:

diff --git a/helm/dagster/charts/dagster-user-deployments/Chart.yaml b/helm/dagster/charts/dagster-user-deployments/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: dagster-user-deployments
 version: 0.0.1-dev
-kubeVersion: ">= 1.18.0-0"
+kubeVersion: ">= 1.19.0-0"
 description: A chart to deploy code servers for your Dagster deployment.
 type: application
 keywords:

diff --git a/helm/dagster/schema/schema/charts/dagster/subschema/ingress.py b/helm/dagster/schema/schema/charts/dagster/subschema/ingress.py
@@ -45,7 +45,6 @@ class FlowerIngressConfiguration(BaseModel):
 
 class Ingress(BaseModel):
     enabled: bool
-    apiVersion: Optional[str]
     annotations: kubernetes.Annotations
     dagit: DagitIngressConfiguration
     readOnlyDagit: DagitIngressConfiguration

diff --git a/helm/dagster/schema/schema_tests/test_ingress.py b/helm/dagster/schema/schema_tests/test_ingress.py
@@ -13,37 +13,20 @@
 from schema.utils.helm_template import HelmTemplate
 
 
-@pytest.fixture(name="template_function")
-def helm_template_function():
-    return lambda output, model: HelmTemplate(
+@pytest.fixture(name="template")
+def helm_template() -> HelmTemplate:
+    return HelmTemplate(
         helm_dir_path="helm/dagster",
         subchart_paths=["charts/dagster-user-deployments"],
-        output=output,
-        model=model,
+        output="templates/ingress.yaml",
+        model=models.V1Ingress,
     )
 
 
-@pytest.mark.parametrize(
-    argnames=["output", "model", "api_version"],
-    argvalues=[
-        (
-            "templates/ingress-v1beta1.yaml",
-            models.ExtensionsV1beta1Ingress,
-            "extensions/v1beta1/Ingress",
-        ),
-        (
-            "templates/ingress.yaml",
-            models.V1Ingress,
-            "networking.k8s.io/v1/Ingress",
-        ),
-    ],
-)
-def test_ingress(template_function, output, model, api_version):
-    template = template_function(output, model)
+def test_ingress(template):
     helm_values = DagsterHelmValues.construct(
         ingress=Ingress.construct(
             enabled=True,
-            apiVersion=api_version,
             dagit=DagitIngressConfiguration.construct(
                 host="foobar.com",
                 path="bing",
@@ -70,27 +53,10 @@ def test_ingress(template_function, output, model, api_version):
     assert rule.host == "foobar.com"
 
 
-@pytest.mark.parametrize(
-    argnames=["output", "model", "api_version"],
-    argvalues=[
-        (
-            "templates/ingress-v1beta1.yaml",
-            models.ExtensionsV1beta1Ingress,
-            "extensions/v1beta1/Ingress",
-        ),
-        (
-            "templates/ingress.yaml",
-            models.V1Ingress,
-            "networking.k8s.io/v1/Ingress",
-        ),
-    ],
-)
-def test_ingress_read_only(template_function, output, model, api_version):
-    template = template_function(output, model)
+def test_ingress_read_only(template):
     helm_values = DagsterHelmValues.construct(
         ingress=Ingress.construct(
             enabled=True,
-            apiVersion=api_version,
             dagit=DagitIngressConfiguration.construct(
                 host="foobar.com",
                 path="bing",
@@ -127,23 +93,7 @@ def test_ingress_read_only(template_function, output, model, api_version):
     assert [rule.host for rule in ingress.spec.rules] == ["foobar.com", "dagster.io"]
 
 
-@pytest.mark.parametrize(
-    argnames=["output", "model", "api_version"],
-    argvalues=[
-        (
-            "templates/ingress-v1beta1.yaml",
-            models.ExtensionsV1beta1Ingress,
-            "extensions/v1beta1/Ingress",
-        ),
-        (
-            "templates/ingress.yaml",
-            models.V1Ingress,
-            "networking.k8s.io/v1/Ingress",
-        ),
-    ],
-)
-def test_ingress_tls(template_function, output, model, api_version):
-    template = template_function(output, model)
+def test_ingress_tls(template):
     dagit_host = "dagit.com"
     dagit_readonly_host = "dagit-readonly.com"
     flower_host = "flower.com"
@@ -155,7 +105,6 @@ def test_ingress_tls(template_function, output, model, api_version):
     helm_values = DagsterHelmValues.construct(
         ingress=Ingress.construct(
             enabled=True,
-            apiVersion=api_version,
             dagit=DagitIngressConfiguration.construct(
                 host=dagit_host,
                 pathType=IngressPathType.IMPLEMENTATION_SPECIFIC,

diff --git a/helm/dagster/schema/setup.py b/helm/dagster/schema/setup.py
@@ -20,8 +20,7 @@
     install_requires=["click", "pydantic"],
     extras_require={
         "test": [
-            # remove pin once minimum supported kubernetes version is 1.19
-            "kubernetes<22.6.0"
+            "kubernetes",
         ]
     },
     entry_points={

diff --git a/helm/dagster/templates/ingress-v1beta1.yaml b/helm/dagster/templates/ingress-v1beta1.yaml
diff --git a/helm/dagster/templates/ingress.yaml b/helm/dagster/templates/ingress.yaml
@@ -1,7 +1,4 @@
-{{- $apiVersion := .Values.ingress.apiVersion | default "" }}
-{{- $hasApiVersion := (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") }}
-{{- $hasOverrideApiVersion := eq $apiVersion "networking.k8s.io/v1/Ingress" }}
-{{- if and (.Values.ingress.enabled) (or $hasApiVersion $hasOverrideApiVersion) }}
+{{- if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/helm/dagster/values.schema.json b/helm/dagster/values.schema.json