Generalized Fakeclient

Author: Raghul-M

support/batch_test.go

@@ -24,14 +24,8 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/fake"
 )
 
-func NewFakeKubeClientWithObjects(objects ...runtime.Object) *fake.Clientset {
-	fakeClient := fake.NewSimpleClientset(objects...)
-	return fakeClient
-}
-
 func TestGetJob(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)

support/fakeclient.go

@@ -0,0 +1,11 @@
+package support
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/kubernetes/fake"
+)
+
+func NewFakeKubeClientWithObjects(objects ...runtime.Object) *fake.Clientset {
+	fakeClient := fake.NewSimpleClientset(objects...)
+	return fakeClient
+}

support/fakeclientwithscheme.go

@@ -0,0 +1,11 @@
+package support
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func NewFakeKubeClientWithScheme(scheme *runtime.Scheme, objects ...client.Object) client.Client {
+	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+}

support/image_test.go

@@ -9,15 +9,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	imagev1 "github.com/openshift/api/image/v1"
 )
 
-func NewFakeKubeClientWithImages(scheme *runtime.Scheme, objects ...client.Object) client.Client {
-	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
-}
-
 func TestGetImageStream(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 
@@ -32,7 +27,7 @@ func TestGetImageStream(t *testing.T) {
 			},
 		},
 	}
-	fakeClient := NewFakeKubeClientWithImages(scheme, fakeImageStream...)
+	fakeClient := NewFakeKubeClientWithScheme(scheme, fakeImageStream...)
 
 	image := &imagev1.ImageStream{}
 

support/ingress_test.go

@@ -8,14 +8,8 @@ import (
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/fake"
 )
 
-func NewFakeKubeClientForIngress(objects ...runtime.Object) *fake.Clientset {
-	fakeClient := fake.NewSimpleClientset(objects...)
-	return fakeClient
-}
-
 func TestGetIngress(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)
@@ -28,7 +22,7 @@ func TestGetIngress(t *testing.T) {
 			},
 		},
 	}
-	fakeClient := NewFakeKubeClientForIngress(fakeIngress...)
+	fakeClient := NewFakeKubeClientWithObjects(fakeIngress...)
 
 	test := With(t).(*T)
 	test.client = &testClient{

support/machine_test.go

@@ -9,15 +9,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
 )
 
-func NewFakeKubeClientWithMachines(scheme *runtime.Scheme, objects ...client.Object) client.Client {
-	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
-}
-
 func TestGetMachineSets(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 
@@ -32,7 +27,7 @@ func TestGetMachineSets(t *testing.T) {
 			},
 		},
 	}
-	fakeClient := NewFakeKubeClientWithMachines(scheme, testmachines...)
+	fakeClient := NewFakeKubeClientWithScheme(scheme, testmachines...)
 
 	machine := &machinev1beta1.MachineSet{}
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "test-machineset-1", Namespace: "openshift-machine-api"}, machine)
@@ -44,7 +39,6 @@ func TestGetMachineSets(t *testing.T) {
 
 }
 
-
 /*
 import (
 

support/ocm_test.go

@@ -1,7 +1,6 @@
 package support
 
 /*
-
 import (
 	"testing"
 	"github.com/onsi/gomega"
@@ -31,5 +30,4 @@ func TestGetMachinePools(t *testing.T) {
 	machinePools := GetMachinePools(test, &ocmsdk.Connection{})
 	test.Expect(machinePools).Should(gomega.HaveLen(1), "Expected 1 machine pool, but got %d", len(machinePools))
 }
-
 */

support/ray_test.go

@@ -10,13 +10,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
-func NewFakeClient(scheme *runtime.Scheme, objects ...client.Object) client.Client {
-	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
-}
-
 func TestGetRayJob(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 
@@ -32,7 +27,7 @@ func TestGetRayJob(t *testing.T) {
 		},
 	}
 
-	fakeClient := NewFakeClient(scheme, fakeRayJobs...)
+	fakeClient := NewFakeKubeClientWithScheme(scheme, fakeRayJobs...)
 
 	rayJob := &rayv1alpha1.RayJob{}
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-job-1", Namespace: "my-namespace"}, rayJob)
@@ -59,7 +54,7 @@ func TestGetRayCluster(t *testing.T) {
 		},
 	}
 
-	fakeClient := NewFakeClient(scheme, fakeRayCluster...)
+	fakeClient := NewFakeKubeClientWithScheme(scheme, fakeRayCluster...)
 
 	raycluster := &rayv1alpha1.RayCluster{}
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-cluster-1", Namespace: "my-namespace"}, raycluster)

support/route_test.go

@@ -9,15 +9,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	routev1 "github.com/openshift/api/route/v1"
 )
 
-func NewFakeKubeClientWithRoute(scheme *runtime.Scheme, objects ...client.Object) client.Client {
-	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
-}
-
 func TestGetRoute(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)
@@ -33,7 +28,7 @@ func TestGetRoute(t *testing.T) {
 			},
 		},
 	}
-	fakeClient := NewFakeKubeClientWithRoute(scheme, fakeroute...)
+	fakeClient := NewFakeKubeClientWithScheme(scheme, fakeroute...)
 
 	route := &routev1.Route{}
 	err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "test-1", Namespace: "my-namespace"}, route)