Move getKubernetesClient function to helpers

Author: shaun-nx

internal/framework/helpers/helpers.go

@@ -9,7 +9,11 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"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"
 )
 
 // Diff prints the diff between two structs.
@@ -103,3 +107,20 @@ func RandomPrimeNumber() int64 {
 func UniqueResourceName(name string) string {
 	return fmt.Sprintf("%s-%d", name, RandomPrimeNumber())
 }
+
+// GetKubernetesClient returns a client connected to a real Kubernetes cluster.
+func GetKubernetesClient() (k8sClient client.Client, err error) {
+	// Use controller-runtime to get cluster connection
+	k8sConfig, err := controllerruntime.GetConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	// Set up scheme with NGF types
+	scheme := runtime.NewScheme()
+	if err = ngfAPIv1alpha1.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})
+}

internal/framework/helpers/helpers_test.go

@@ -1,6 +1,7 @@
 package helpers_test
 
 import (
+	"context"
 	"testing"
 	"text/template"
 
@@ -9,6 +10,8 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3"
 
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
 )
 
@@ -131,3 +134,18 @@ func TestMustReturnUniqueResourceName(t *testing.T) {
 	g.Expect(uniqueName).To(HaveSuffix("-"))
 	g.Expect(len(uniqueName)).To(BeNumerically(">", len(name)))
 }
+
+func TestMustCreateKubernetesClient(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+
+	k8sClient, err := helpers.GetKubernetesClient()
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(k8sClient).ToNot(BeNil())
+
+	// Check that the client can be used to list namespaces
+	namespaces := &corev1.NamespaceList{}
+	err = k8sClient.List(context.Background(), namespaces)
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(namespaces.Items).ToNot(BeEmpty())
+}

tests/cel/clientsettingspolicy_test.go

@@ -5,9 +5,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-	"k8s.io/apimachinery/pkg/runtime"
 	controllerruntime "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
 	ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
@@ -157,9 +155,7 @@ func validateClientSettingsPolicy(t *testing.T, tt struct {
 	t.Helper()
 	g := NewWithT(t)
 
-	// Get Kubernetes client from test framework
-	// This should be set up by your test framework to connect to a real cluster
-	k8sClient, err := getKubernetesClient(t)
+	k8sClient, err := ngfHelpers.GetKubernetesClient()
 
 	g.Expect(err).ToNot(HaveOccurred())
 
@@ -197,21 +193,3 @@ func validateClientSettingsPolicy(t *testing.T, tt struct {
 		g.Expect(err.Error()).To(ContainSubstring(wantError), "Expected error '%s' not found in: %s", wantError, err.Error())
 	}
 }
-
-// getKubernetesClient returns a client connected to a real Kubernetes cluster.
-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 {
-		return nil, err
-	}
-
-	// Set up scheme with NGF types
-	scheme := runtime.NewScheme()
-	if err = ngfAPIv1alpha1.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})
-}