Move common constatns to common.go and add v1alpha2 to client schema

Author: shaun-nx

tests/cel/clientsettingspolicy_test.go

@@ -12,30 +12,6 @@ import (
 	ngfHelpers "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
 )
 
-const (
-	GatewayKind   = "Gateway"
-	HTTPRouteKind = "HTTPRoute"
-	GRPCRouteKind = "GRPCRoute"
-	TCPRouteKind  = "TCPRoute"
-	InvalidKind   = "InvalidKind"
-)
-
-const (
-	GatewayGroup   = "gateway.networking.k8s.io"
-	InvalidGroup   = "invalid.networking.k8s.io"
-	DiscoveryGroup = "discovery.k8s.io/v1"
-)
-
-const (
-	ExpectedTargetRefKindError  = `TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute`
-	ExpectedTargetRefGroupError = `TargetRef Group must be gateway.networking.k8s.io.`
-)
-
-const (
-	PolicyName = "test-policy"
-	TargetRef  = "targetRef-name"
-)
-
 func TestClientSettingsPoliciesTargetRefKind(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
@@ -155,7 +131,7 @@ func validateClientSettingsPolicy(t *testing.T, tt struct {
 	t.Helper()
 	g := NewWithT(t)
 
-	k8sClient, err := GetKubernetesClient()
+	k8sClient, err := GetKubernetesClient(t)
 
 	g.Expect(err).ToNot(HaveOccurred())
 

tests/cel/common.go

@@ -1,15 +1,43 @@
 package cel
 
 import (
+	"testing"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
+	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
+)
+
+const (
+	GatewayKind   = "Gateway"
+	HTTPRouteKind = "HTTPRoute"
+	GRPCRouteKind = "GRPCRoute"
+	TCPRouteKind  = "TCPRoute"
+	InvalidKind   = "InvalidKind"
+)
+
+const (
+	GatewayGroup   = "gateway.networking.k8s.io"
+	InvalidGroup   = "invalid.networking.k8s.io"
+	DiscoveryGroup = "discovery.k8s.io/v1"
+)
+
+const (
+	ExpectedTargetRefKindError  = `TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute`
+	ExpectedTargetRefGroupError = `TargetRef Group must be gateway.networking.k8s.io.`
+)
+
+const (
+	PolicyName = "test-policy"
+	TargetRef  = "targetRef-name"
 )
 
 // GetKubernetesClient returns a client connected to a real Kubernetes cluster.
-func GetKubernetesClient() (k8sClient client.Client, err error) {
+func GetKubernetesClient(t *testing.T) (k8sClient client.Client, err error) {
+	t.Helper()
 	// Use controller-runtime to get cluster connection
 	k8sConfig, err := controllerruntime.GetConfig()
 	if err != nil {
@@ -21,6 +49,9 @@ func GetKubernetesClient() (k8sClient client.Client, err error) {
 	if err = ngfAPIv1alpha1.AddToScheme(scheme); err != nil {
 		return nil, err
 	}
+	if err = ngfAPIv1alpha2.AddToScheme(scheme); err != nil {
+		return nil, err
+	}
 	// Create a new client with the scheme and return it
 	return client.New(k8sConfig, client.Options{Scheme: scheme})
 }