From 7fd2bf84ab1ef82e238bdbbfa71be39de2e26dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Wed, 29 May 2024 12:21:23 +0200 Subject: [PATCH] tests(conformance): enable HTTPRouteInvalidBackendRefUnknownKind --- .github/workflows/tests.yaml | 2 +- test/conformance/conformance_test.go | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 21224c176..3bef6b0a3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -224,7 +224,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: conformance-report-${{ matrix.router-flavor }} - path: kong-gateway-operator*.yaml + path: standard-*-report.yaml integration-tests: runs-on: ubuntu-latest diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 05d1c6691..10a57060a 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -21,6 +21,7 @@ import ( "github.com/kong/gateway-operator/api/v1beta1" gwtypes "github.com/kong/gateway-operator/internal/types" "github.com/kong/gateway-operator/modules/manager/metadata" + "github.com/kong/gateway-operator/pkg/consts" testutils "github.com/kong/gateway-operator/pkg/utils/test" "github.com/kong/gateway-operator/pkg/vars" ) @@ -29,9 +30,6 @@ var skippedTestsForExpressionsRouter = []string{ // gateway tests.GatewayInvalidTLSConfiguration.ShortName, - // httproute - tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName, - // TODO: remove the skip https://github.com/Kong/gateway-operator/issues/295 // This test is flaky. tests.HTTPRouteWeight.ShortName, @@ -130,7 +128,7 @@ func createGatewayConfiguration(ctx context.Context, t *testing.T, c Conformance Spec: corev1.PodSpec{ Containers: []corev1.Container{ { - Name: "proxy", + Name: consts.DataPlaneProxyContainerName, ReadinessProbe: &corev1.Probe{ InitialDelaySeconds: 1, PeriodSeconds: 1, @@ -164,7 +162,7 @@ func createGatewayConfiguration(ctx context.Context, t *testing.T, c Conformance Spec: corev1.PodSpec{ Containers: []corev1.Container{ { - Name: "controller", + Name: consts.ControlPlaneControllerContainerName, ReadinessProbe: &corev1.Probe{ InitialDelaySeconds: 1, PeriodSeconds: 1, @@ -184,10 +182,15 @@ func createGatewayConfiguration(ctx context.Context, t *testing.T, c Conformance Name: "CONTROLLER_LOG_LEVEL", Value: "debug", }, + { + // NOTE: we disable the admission webhook to allow broken + // resources to be created so that their status can be + // filled to satisfy conformance suite expectations. + Name: "CONTROLLER_ADMISSION_WEBHOOK_LISTEN", + Value: "off", + }, }, - // TODO: https://github.com/Kong/gateway-operator/issues/294 - // change nightly to 3.2 when that's released - Image: "kong/nightly-ingress-controller:2024-05-28", + Image: "kong/kubernetes-ingress-controller:3.2.0", }, }, },