add WithConfig function to pass custom config for new client creation

Author: abhijeet-dhumal

go.sum

@@ -799,4 +799,4 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h6
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

support/client.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
 	imagev1 "github.com/openshift/client-go/image/clientset/versioned"
@@ -81,13 +82,16 @@ func (t *testClient) Dynamic() dynamic.Interface {
 	return t.dynamic
 }
 
-func newTestClient() (Client, error) {
-	cfg, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
-		clientcmd.NewDefaultClientConfigLoadingRules(),
-		&clientcmd.ConfigOverrides{},
-	).ClientConfig()
-	if err != nil {
-		return nil, err
+func newTestClient(cfg *rest.Config) (Client, error) {
+	var err error
+	if cfg == nil {
+		cfg, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+			clientcmd.NewDefaultClientConfigLoadingRules(),
+			&clientcmd.ConfigOverrides{},
+		).ClientConfig()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	kubeClient, err := kubernetes.NewForConfig(cfg)

support/test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/onsi/gomega"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/rest"
 )
 
 type Test interface {
@@ -54,8 +55,13 @@ func (o errorOption[T]) applyTo(to T) error {
 var _ Option[any] = errorOption[any](nil)
 
 func With(t *testing.T) Test {
+	return WithConfig(t, nil)
+}
+
+func WithConfig(t *testing.T, cfg *rest.Config) Test {
 	t.Helper()
 	ctx := context.Background()
+
 	if deadline, ok := t.Deadline(); ok {
 		withDeadline, cancel := context.WithDeadline(ctx, deadline)
 		t.Cleanup(cancel)
@@ -66,6 +72,7 @@ func With(t *testing.T) Test {
 		WithT: gomega.NewWithT(t),
 		t:     t,
 		ctx:   ctx,
+		cfg:   cfg,
 	}
 }
 
@@ -75,6 +82,7 @@ type T struct {
 	// nolint: containedctx
 	ctx       context.Context
 	client    Client
+	cfg       *rest.Config
 	outputDir string
 	once      struct {
 		client    sync.Once
@@ -94,7 +102,7 @@ func (t *T) Client() Client {
 	t.T().Helper()
 	t.once.client.Do(func() {
 		if t.client == nil {
-			c, err := newTestClient()
+			c, err := newTestClient(t.cfg)
 			if err != nil {
 				t.T().Fatalf("Error creating client: %v", err)
 			}