diff --git a/k8s/manifests/charts/contour-17.0.4.tgz b/k8s/manifests/charts/contour-17.0.4.tgz new file mode 100644 index 000000000..46679cbba Binary files /dev/null and b/k8s/manifests/charts/contour-17.0.4.tgz differ diff --git a/k8s/manifests/charts/contour-18.1.2.tgz b/k8s/manifests/charts/contour-18.1.2.tgz deleted file mode 100644 index dd6b9ef29..000000000 Binary files a/k8s/manifests/charts/contour-18.1.2.tgz and /dev/null differ diff --git a/src/k8s/pkg/k8sd/features/contour/chart.go b/src/k8s/pkg/k8sd/features/contour/chart.go index d8d7395a6..1b64a2430 100644 --- a/src/k8s/pkg/k8sd/features/contour/chart.go +++ b/src/k8s/pkg/k8sd/features/contour/chart.go @@ -12,7 +12,7 @@ var ( chartContour = helm.InstallableChart{ Name: "ck-ingress", Namespace: "projectcontour", - ManifestPath: path.Join("charts", "contour-18.1.2.tgz"), + ManifestPath: path.Join("charts", "contour-17.0.4.tgz"), } // chartGateway represents manifests to deploy Contour Gateway. // This excludes shared CRDs. diff --git a/tests/integration/tests/test_gateway.py b/tests/integration/tests/test_gateway.py index 0dc5e49de..f697d07e6 100644 --- a/tests/integration/tests/test_gateway.py +++ b/tests/integration/tests/test_gateway.py @@ -55,7 +55,6 @@ def test_gateway(session_instance: harness.Instance): capture_output=True, ) - # TODO: test this services = json.loads(p.stdout.decode()) LOG.info(f"services: {services}") for svc in services["items"]: @@ -70,7 +69,7 @@ def test_gateway(session_instance: harness.Instance): assert gateway_http_port is not None, "No ingress nodePort found." - LOG.info(f"Gateway node port is {gateway_http_port}") + LOG.info(f"Gateway http port is {gateway_http_port}") util.stubbornly(retries=5, delay_s=5).on(session_instance).until( lambda p: "Welcome to nginx!" in p.stdout.decode() ).exec(["curl", f"localhost:{gateway_http_port}"]) diff --git a/tests/integration/tests/test_ingress.py b/tests/integration/tests/test_ingress.py index d37d825fd..de0d866e2 100644 --- a/tests/integration/tests/test_ingress.py +++ b/tests/integration/tests/test_ingress.py @@ -32,7 +32,6 @@ def test_ingress(session_instance: List[harness.Instance]): ingress_http_port = None services = json.loads(p.stdout.decode()) - LOG.info(f"services: {services}") for svc in services["items"]: if "ingress" in svc["metadata"]["name"]: LOG.info(f"Found service {svc['metadata']['name']}") @@ -44,7 +43,7 @@ def test_ingress(session_instance: List[harness.Instance]): break assert ingress_http_port is not None, "No ingress nodePort found." - LOG.info(f"Found ingress nodePort: {ingress_http_port}") + LOG.info(f"Found http port: {ingress_http_port}") manifest = MANIFESTS_DIR / "ingress-test.yaml" session_instance.exec(