From b88bac9a700f546a13fe363483c966e16274553c Mon Sep 17 00:00:00 2001
From: Sunjay Bhatia <sunjayb@vmware.com>
Date: Thu, 20 Jul 2023 19:43:56 +0000
Subject: [PATCH] Remove GatewayUnsupportedRoutabilityMutation test

Should be covered by
hack/invalid-examples/gateway/invalid-routability.yaml

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
---
 .../gateway-routability-bad-mutation.yaml     | 15 -----
 conformance/tests/gateway-routability.go      | 55 -------------------
 2 files changed, 70 deletions(-)
 delete mode 100644 conformance/tests/gateway-routability-bad-mutation.yaml

diff --git a/conformance/tests/gateway-routability-bad-mutation.yaml b/conformance/tests/gateway-routability-bad-mutation.yaml
deleted file mode 100644
index 05f02ee6b2..0000000000
--- a/conformance/tests/gateway-routability-bad-mutation.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: Gateway
-metadata:
-  name: gateway-bad-routability-mutation
-  namespace: gateway-conformance-infra
-spec:
-  gatewayClassName: "{GATEWAY_CLASS_NAME}"
-  listeners:
-  - name: http
-    port: 80
-    protocol: HTTP
-    allowedRoutes:
-      namespaces:
-        from: All
-
diff --git a/conformance/tests/gateway-routability.go b/conformance/tests/gateway-routability.go
index 630b973130..7813622eab 100644
--- a/conformance/tests/gateway-routability.go
+++ b/conformance/tests/gateway-routability.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -38,7 +37,6 @@ func init() {
 	ConformanceTests = append(ConformanceTests, GatewayPrivateRoutability)
 	ConformanceTests = append(ConformanceTests, GatewayClusterRoutability)
 	ConformanceTests = append(ConformanceTests, GatewayUnsupportedRoutability)
-	ConformanceTests = append(ConformanceTests, GatewayUnsupportedRoutabilityMutation)
 }
 
 var GatewayClassRoutability = suite.ConformanceTest{
@@ -115,59 +113,6 @@ var GatewayUnsupportedRoutability = suite.ConformanceTest{
 	},
 }
 
-var GatewayUnsupportedRoutabilityMutation = suite.ConformanceTest{
-	ShortName: "GatewayUnsupportedRoutabilityMutation",
-	Features: []suite.SupportedFeature{
-		suite.SupportGateway,
-		suite.SupportGatewayClassRoutability,
-	},
-	Manifests: []string{
-		"tests/gateway-routability-bad-mutation.yaml",
-	},
-	Description: "Mutating a Gateway to an unsupported routability should set Accepted to False",
-	Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
-		gwn := types.NamespacedName{Name: "gateway-bad-routability-mutation", Namespace: "gateway-conformance-infra"}
-		//nolint:errcheck // the helper throws an error if it fails
-		kubernetes.WaitForGatewayAddress(t, s.Client, s.TimeoutConfig, gwn)
-
-		ctx, cancel := context.WithTimeout(context.Background(), s.TimeoutConfig.GetTimeout)
-		defer cancel()
-
-		gw := &v1beta1.Gateway{}
-		err := s.Client.Get(ctx, gwn, gw)
-		require.NoErrorf(t, err, "error getting Gateway: %v", err)
-
-		routability := v1beta1.GatewayRoutability("a.bad.vendor.prefix/bad!!")
-		if gw.Spec.Infrastructure == nil {
-			gw.Spec.Infrastructure = &v1beta1.GatewayInfrastructure{}
-		}
-		gw.Spec.Infrastructure.Routability = &routability
-
-		err = s.Client.Update(ctx, gw)
-
-		// If an admission webhook rejects a bad routability that's allowed
-		if apierrs.IsBadRequest(err) {
-			return
-		}
-		require.NoErrorf(t, err, "error updating Gateway: %v", err)
-
-		kubernetes.GatewayMustHaveLatestConditions(t, s.Client, s.TimeoutConfig, gwn)
-
-		err = s.Client.Get(ctx, gwn, gw)
-		require.NoErrorf(t, err, "error getting Gateway: %v", err)
-
-		for _, cond := range gw.Status.Conditions {
-			if cond.Type == string(v1beta1.GatewayConditionAccepted) {
-				if cond.Status != metav1.ConditionFalse {
-					t.Errorf("expected Accepted condition to be 'False': was %q", cond.Status)
-				} else if cond.Reason != string(v1beta1.GatewayUnsupportedRoutability) {
-					t.Errorf("expected Accepted condition reason to be %q: was %q", v1beta1.GatewayUnsupportedRoutability, cond.Status)
-				}
-			}
-		}
-	},
-}
-
 var GatewayPublicRoutability = suite.ConformanceTest{
 	ShortName: "GatewayPublicRoutability",
 	Features: []suite.SupportedFeature{