Uses query pkg to process conditions and refactors e2e tests

Signed-off-by: Daneyon Hansen <[email protected]>

changelog/v1.18.0-rc3/issue_7309.yaml

@@ -3,4 +3,4 @@ changelog:
     issueLink: https://github.com/solo-io/solo-projects/issues/7309
     resolvesIssue: true
     description: >-
-      Adds ReferenceGRant support for the TCPRoute type.
+      Adds ReferenceGrant support for the TCPRoute type, allowing cross namespace references.

pkg/schemes/extended_scheme.go

@@ -13,7 +13,7 @@ import (
 	gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 )
 
-// AddGatewayV1A2Scheme adds the gwv1a2 scheme to the provided scheme if the TCPRoute CRD exists.
+// AddGatewayV1A2Scheme adds the Gateway v1alpha2 scheme to the provided scheme if the TCPRoute CRD exists.
 func AddGatewayV1A2Scheme(restConfig *rest.Config, scheme *runtime.Scheme) error {
 	exists, err := CRDExists(restConfig, gwv1a2.GroupVersion.Group, gwv1a2.GroupVersion.Version, wellknown.TCPRouteKind)
 	if err != nil {

pkg/schemes/scheme.go

@@ -64,8 +64,9 @@ func DefaultScheme() *runtime.Scheme {
 	return s
 }
 
-// TestingScheme unconditionally includes the default and required Gateway API schemes.
-func TestingScheme() *runtime.Scheme {
+// GatewayScheme unconditionally includes the default and required Gateway API schemes.
+// Use the Default scheme with AddGatewayV1A2Scheme to conditionally add the v1alpha2 scheme.
+func GatewayScheme() *runtime.Scheme {
 	s := DefaultScheme()
 	if err := gwv1a2.Install(s); err != nil {
 		panic(fmt.Sprintf("Failed to install gateway v1alpha2 scheme: %v", err))

projects/gateway2/controller/controller_suite_test.go

@@ -86,7 +86,7 @@ var _ = BeforeSuite(func() {
 	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
-	scheme := schemes.DefaultScheme()
+	scheme := schemes.GatewayScheme()
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())

projects/gateway2/deployer/deployer_test.go

@@ -1438,7 +1438,7 @@ var _ = Describe("Deployer", func() {
 // initialize a fake controller-runtime client with the given list of objects
 func newFakeClientWithObjs(objs ...client.Object) client.Client {
 	return fake.NewClientBuilder().
-		WithScheme(schemes.TestingScheme()).
+		WithScheme(schemes.GatewayScheme()).
 		WithObjects(objs...).
 		Build()
 }

projects/gateway2/query/query_test.go

@@ -36,7 +36,7 @@ var _ = Describe("Query", func() {
 	}
 
 	BeforeEach(func() {
-		scheme = schemes.TestingScheme()
+		scheme = schemes.GatewayScheme()
 		builder = fake.NewClientBuilder().WithScheme(scheme)
 		err := query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 			builder.WithIndex(o, f, fun)

projects/gateway2/translator/listener/gateway_listener_translator.go

@@ -261,21 +261,19 @@ func buildTcpHost(
 	tcpHost := &v1.TcpHost{Name: tcpRouteName}
 
 	var weightedDestinations []*v1.WeightedDestination
-	resolvedRefs := true
-	hasValidBackend := false
 
+	resolvedRefs := 0
 	for _, ref := range backendRefs {
 		// Try to get the backend object
 		obj, err := routeInfo.GetBackendForRef(ref.BackendObjectReference)
 		if err != nil {
-			// Process error and set ResolvedRefs condition to False
-			resolvedRefs = false
+			// Process error and set the appropriate status conditions
 			for _, parentRefReporter := range parentRefReporters {
 				query.ProcessBackendError(err, parentRefReporter)
 			}
 			continue
 		}
-		hasValidBackend = true
+		resolvedRefs += 1
 
 		// Process the backend object
 		var destination *v1.Destination
@@ -301,7 +299,6 @@ func buildTcpHost(
 		} else {
 			// Unsupported kind
 			err := query.ErrUnknownBackendKind
-			resolvedRefs = false
 			for _, parentRefReporter := range parentRefReporters {
 				query.ProcessBackendError(err, parentRefReporter)
 			}
@@ -314,34 +311,18 @@ func buildTcpHost(
 		})
 	}
 
-	if !hasValidBackend {
-		// No valid backends, do not create TcpHost
-		return nil
-	}
-
-	// Handle ResolvedRefs condition
-	if !resolvedRefs {
-		// Set ResolvedRefs condition to False
+	// All backendRefs are resolved, set the ResolvedRefs status condition to true
+	if resolvedRefs == len(backendRefs) {
 		for _, parentRefReporter := range parentRefReporters {
 			parentRefReporter.SetCondition(reports.RouteCondition{
 				Type:   gwv1.RouteConditionResolvedRefs,
-				Status: metav1.ConditionFalse,
-				Reason: gwv1.RouteReasonRefNotPermitted,
+				Status: metav1.ConditionTrue,
+				Reason: gwv1.RouteReasonResolvedRefs,
 			})
 		}
-		// Do not create TcpHost
-		return nil
-	}
-
-	// Set ResolvedRefs condition to True
-	for _, parentRefReporter := range parentRefReporters {
-		parentRefReporter.SetCondition(reports.RouteCondition{
-			Type:   gwv1.RouteConditionResolvedRefs,
-			Status: metav1.ConditionTrue,
-			Reason: gwv1.RouteReasonResolvedRefs,
-		})
 	}
 
+	// Set the TcpHost destination type
 	if len(weightedDestinations) == 0 {
 		// No valid destinations, return nil
 		return nil

projects/gateway2/translator/plugins/httplisteneroptions/query/query_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Query Get HttpListenerOptions", func() {
 	})
 
 	JustBeforeEach(func() {
-		builder := fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+		builder := fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 		query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 			builder.WithIndex(o, f, fun)
 			return nil

projects/gateway2/translator/plugins/listeneroptions/query/query_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Query Get ListenerOptions", func() {
 	})
 
 	JustBeforeEach(func() {
-		builder := fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+		builder := fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 		query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 			builder.WithIndex(o, f, fun)
 			return nil

projects/gateway2/translator/plugins/routeoptions/query/query_test.go

@@ -30,7 +30,7 @@ var _ = Describe("Query", func() {
 	var builder *fake.ClientBuilder
 
 	BeforeEach(func() {
-		builder = fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+		builder = fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 		query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 			builder.WithIndex(o, f, fun)
 			return nil

projects/gateway2/translator/plugins/virtualhostoptions/query/query_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Query Get VirtualHostOptions", func() {
 	})
 
 	JustBeforeEach(func() {
-		builder := fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+		builder := fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 		query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 			builder.WithIndex(o, f, fun)
 			return nil

projects/gateway2/translator/testutils/outputs/tcp-routing/invalid-backend.yaml

@@ -1,3 +1,4 @@
+# Expected listeners when a TCPRoute contains an unsupported backendRef.
 ---
 listeners:
 - name: tcp

projects/gateway2/translator/testutils/outputs/tcp-routing/missing-backend.yaml

@@ -1,3 +1,4 @@
+# Expected listeners when a TCPRoute references a non-existent Service as a backendRef.
 ---
 listeners:
 - aggregateListener:

projects/gateway2/translator/testutils/test_file_loader.go

@@ -86,7 +86,7 @@ func LoadFromFiles(ctx context.Context, filename string) ([]client.Object, error
 }
 
 func parseFile(ctx context.Context, filename string) ([]runtime.Object, error) {
-	scheme := schemes.TestingScheme()
+	scheme := schemes.GatewayScheme()
 	file, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err

projects/gateway2/translator/testutils/test_queries.go

@@ -10,7 +10,7 @@ import (
 type IndexIteratorFunc = func(f func(client.Object, string, client.IndexerFunc) error) error
 
 func BuildIndexedFakeClient(objs []client.Object, funcs ...IndexIteratorFunc) client.Client {
-	builder := fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+	builder := fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 	for _, f := range funcs {
 		f(func(o client.Object, s string, ifunc client.IndexerFunc) error {
 			builder.WithIndex(o, s, ifunc)
@@ -22,19 +22,19 @@ func BuildIndexedFakeClient(objs []client.Object, funcs ...IndexIteratorFunc) cl
 }
 
 func BuildGatewayQueriesWithClient(fakeClient client.Client, opts ...query.Option) query.GatewayQueries {
-	return query.NewData(fakeClient, schemes.TestingScheme(), opts...)
+	return query.NewData(fakeClient, schemes.GatewayScheme(), opts...)
 }
 
 func BuildGatewayQueries(
 	objs []client.Object,
 ) query.GatewayQueries {
-	builder := fake.NewClientBuilder().WithScheme(schemes.TestingScheme())
+	builder := fake.NewClientBuilder().WithScheme(schemes.GatewayScheme())
 	query.IterateIndices(func(o client.Object, f string, fun client.IndexerFunc) error {
 		builder.WithIndex(o, f, fun)
 		return nil
 	})
 
 	fakeClient := builder.WithObjects(objs...).Build()
 
-	return query.NewData(fakeClient, schemes.TestingScheme())
+	return query.NewData(fakeClient, schemes.GatewayScheme())
 }

test/kubernetes/e2e/features/services/tcproute/suite.go

@@ -77,7 +77,7 @@ type tcpRouteTestCase struct {
 
 func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 	testCases := []tcpRouteTestCase{
-		{
+		/*{
 			name:             "SingleServiceTCPRoute",
 			nsManifest:       singleSvcNsManifest,
 			gtwName:          singleSvcGatewayName,
@@ -118,9 +118,9 @@ func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 			},
 			expectedRouteCounts: []int32{1, 1},
 			tcpRouteNames:       []string{multiSvcTCPRouteName1, multiSvcTCPRouteName2},
-		},
+		},*/
 		{
-			name:             "CrossNamespaceTCPRouteWithReferenceGrant",
+			name:             crossNsTestName,
 			nsManifest:       crossNsClientNsManifest,
 			gtwName:          crossNsGatewayName,
 			gtwNs:            crossNsClientName,
@@ -140,10 +140,10 @@ func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 			tcpRouteNames:       []string{crossNsTCPRouteName},
 		},
 		{
-			name:              "CrossNamespaceTCPRouteWithoutReferenceGrant",
+			name:              crossNsNoRefGrantTestName,
 			nsManifest:        crossNsNoRefGrantClientNsManifest,
 			gtwName:           crossNsNoRefGrantGatewayName,
-			gtwNs:             crossNsNoRefGrantClientName,
+			gtwNs:             crossNsNoRefGrantClientNsName,
 			gtwManifest:       crossNsNoRefGrantGatewayManifest,
 			svcManifest:       crossNsNoRefGrantBackendSvcManifest,
 			tcpRouteManifest:  crossNsNoRefGrantTCPRouteManifest,
@@ -164,33 +164,30 @@ func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 		s.Run(tc.name, func() {
 			// Cleanup function
 			s.T().Cleanup(func() {
-				err := s.deleteManifests(tc.nsManifest)
-				s.Require().NoError(err, fmt.Sprintf("Failed to delete manifest %s", tc.nsManifest))
+				s.deleteManifests(tc.nsManifest)
 
 				// Delete additional namespaces if any
 				if tc.name == "CrossNamespaceTCPRouteWithReferenceGrant" {
-					err = s.deleteManifests(crossNsBackendNsManifest)
-					s.Require().NoError(err, fmt.Sprintf("Failed to delete manifest %s", crossNsBackendNsManifest))
+					s.deleteManifests(crossNsBackendNsManifest)
 				}
 
-				if tc.name == "CrossNamespaceTCPRouteWithoutReferenceGrant" {
-					err = s.deleteManifests(crossNsNoRefGrantBackendNsManifest)
-					s.Require().NoError(err, fmt.Sprintf("Failed to delete manifest %s", crossNsNoRefGrantBackendNsManifest))
+				if tc.name == crossNsNoRefGrantTestName {
+					s.deleteManifests(crossNsNoRefGrantBackendNsManifest)
 				}
 
 				s.testInstallation.Assertions.EventuallyObjectsNotExist(s.ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: tc.gtwNs}})
 			})
 
 			// Setup environment for ReferenceGrant test cases
-			if tc.name == "CrossNamespaceTCPRouteWithReferenceGrant" {
-				s.applyManifests(crossNsBackendNsManifest)
-				s.applyManifests(crossNsBackendSvcManifest)
-				s.applyManifests(crossNsReferenceGrantManifest)
+			if tc.name == crossNsTestName {
+				s.applyManifests(crossNsBackendNsName, crossNsBackendNsManifest)
+				s.applyManifests(crossNsBackendNsName, crossNsBackendSvcManifest)
+				s.applyManifests(crossNsBackendNsName, crossNsReferenceGrantManifest)
 			}
 
-			if tc.name == "CrossNamespaceTCPRouteWithoutReferenceGrant" {
-				s.applyManifests(crossNsNoRefGrantBackendNsManifest)
-				s.applyManifests(crossNsNoRefGrantBackendSvcManifest)
+			if tc.name == crossNsNoRefGrantTestName {
+				s.applyManifests(crossNsNoRefGrantBackendNsName, crossNsNoRefGrantBackendNsManifest)
+				s.applyManifests(crossNsNoRefGrantBackendNsName, crossNsNoRefGrantBackendSvcManifest)
 				// ReferenceGrant not applied
 			}
 
@@ -206,15 +203,14 @@ func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 			)
 
 			// Apply TCPRoute manifest
-			err := s.testInstallation.Actions.Kubectl().ApplyFile(s.ctx, tc.tcpRouteManifest)
-			s.Require().NoError(err, fmt.Sprintf("Failed to apply manifest %s", tc.tcpRouteManifest))
+			s.applyManifests(tc.gtwNs, tc.tcpRouteManifest)
 
 			// Assert gateway conditions
 			s.testInstallation.Assertions.EventuallyGatewayCondition(s.ctx, tc.gtwName, tc.gtwNs, v1.GatewayConditionAccepted, metav1.ConditionTrue, timeout)
 
 			// Set the expected status conditions based on the test case
 			expected := metav1.ConditionTrue
-			if tc.name == "CrossNamespaceTCPRouteWithoutReferenceGrant" {
+			if tc.name == crossNsNoRefGrantTestName {
 				expected = metav1.ConditionFalse
 			}
 
@@ -235,7 +231,7 @@ func (s *testingSuite) TestConfigureTCPRouteBackingDestinations() {
 
 			// Assert expected responses
 			for i, port := range tc.ports {
-				if tc.name == "CrossNamespaceTCPRouteWithoutReferenceGrant" {
+				if tc.name == crossNsNoRefGrantTestName {
 					s.testInstallation.Assertions.AssertEventualCurlError(
 						s.ctx,
 						s.execOpts(tc.gtwNs),
@@ -269,35 +265,27 @@ func validateManifestFile(path string) error {
 }
 
 func (s *testingSuite) setupTestEnvironment(nsManifest, gtwName, gtwNs, gtwManifest, svcManifest string, proxySvc *corev1.Service, proxyDeploy *appsv1.Deployment) {
-	s.applyManifests(nsManifest)
+	s.applyManifests(gtwNs, nsManifest)
 
-	s.applyManifests(gtwManifest)
+	s.applyManifests(gtwNs, gtwManifest)
 	s.testInstallation.Assertions.EventuallyGatewayCondition(s.ctx, gtwName, gtwNs, v1.GatewayConditionAccepted, metav1.ConditionTrue, timeout)
 
-	s.applyManifests(svcManifest)
+	s.applyManifests(gtwNs, svcManifest)
 	s.testInstallation.Assertions.EventuallyObjectsExist(s.ctx, proxySvc, proxyDeploy)
 }
 
-func (s *testingSuite) applyManifests(manifests ...string) {
+func (s *testingSuite) applyManifests(ns string, manifests ...string) {
 	for _, manifest := range manifests {
-		s.Eventually(func() bool {
-			err := s.testInstallation.Actions.Kubectl().ApplyFile(s.ctx, manifest)
-			if err != nil {
-				s.T().Logf("Retrying apply manifest: %s, error: %v", manifest, err)
-				return false
-			}
-			return true
-		}, waitTime, tickTime, fmt.Sprintf("Can apply manifest %s", manifest))
+		err := s.testInstallation.Actions.Kubectl().ApplyFile(s.ctx, manifest, "-n", ns)
+		s.Require().NoError(err, fmt.Sprintf("Failed to apply manifest %s", manifest))
 	}
 }
 
-func (s *testingSuite) deleteManifests(manifests ...string) error {
+func (s *testingSuite) deleteManifests(manifests ...string) {
 	for _, manifest := range manifests {
-		if err := s.testInstallation.Actions.Kubectl().DeleteFile(s.ctx, manifest); err != nil {
-			return err
-		}
+		err := s.testInstallation.Actions.Kubectl().DeleteFileSafe(s.ctx, manifest)
+		s.Require().NoError(err, fmt.Sprintf("Failed to delete manifest %s", manifest))
 	}
-	return nil
 }
 
 func (s *testingSuite) execOpts(ns string) kubectl.PodExecOptions {

test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-backend-service.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: backend-svc
-  namespace: cross-namespace-allowed-backend-ns
 spec:
   selector:
     app: backend-svc
@@ -15,7 +14,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: backend-svc
-  namespace: cross-namespace-allowed-backend-ns
   labels:
     app: backend-svc
 spec:

test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-gateway.yaml → test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-gateway-and-client.yaml

@@ -2,7 +2,6 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: gateway
-  namespace: cross-namespace-allowed-client-ns
 spec:
   gatewayClassName: gloo-gateway
   listeners:
@@ -14,7 +13,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: curl
-  namespace: cross-namespace-allowed-client-ns
   labels:
     app: curl
     version: v1