Skip to content

Commit 83832c9

Browse files
committed
Generalized Fakeclient
1 parent 9c552ad commit 83832c9

9 files changed

+28
-41
lines changed

support/batch_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,8 @@ import (
2424
batchv1 "k8s.io/api/batch/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime"
27-
"k8s.io/client-go/kubernetes/fake"
2827
)
2928

30-
func NewFakeKubeClientWithObjects(objects ...runtime.Object) *fake.Clientset {
31-
fakeClient := fake.NewSimpleClientset(objects...)
32-
return fakeClient
33-
}
34-
3529
func TestGetJob(t *testing.T) {
3630

3731
g := gomega.NewGomegaWithT(t)

support/fakeclient.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package support
2+
3+
import (
4+
"k8s.io/apimachinery/pkg/runtime"
5+
"k8s.io/client-go/kubernetes/fake"
6+
)
7+
8+
func NewFakeKubeClientWithObjects(objects ...runtime.Object) *fake.Clientset {
9+
fakeClient := fake.NewSimpleClientset(objects...)
10+
return fakeClient
11+
}

support/fakeclientwithscheme.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package support
2+
3+
import (
4+
"k8s.io/apimachinery/pkg/runtime"
5+
"sigs.k8s.io/controller-runtime/pkg/client"
6+
"sigs.k8s.io/controller-runtime/pkg/client/fake"
7+
)
8+
9+
func NewFakeKubeClientWithScheme(scheme *runtime.Scheme, objects ...client.Object) client.Client {
10+
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
11+
}

support/image_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"sigs.k8s.io/controller-runtime/pkg/client"
12-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1312

1413
imagev1 "github.com/openshift/api/image/v1"
1514
)
1615

17-
func NewFakeKubeClientWithImages(scheme *runtime.Scheme, objects ...client.Object) client.Client {
18-
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
19-
}
20-
2116
func TestGetImageStream(t *testing.T) {
2217
g := gomega.NewGomegaWithT(t)
2318

@@ -32,7 +27,7 @@ func TestGetImageStream(t *testing.T) {
3227
},
3328
},
3429
}
35-
fakeClient := NewFakeKubeClientWithImages(scheme, fakeImageStream...)
30+
fakeClient := NewFakeKubeClientWithScheme(scheme, fakeImageStream...)
3631

3732
image := &imagev1.ImageStream{}
3833

support/ingress_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@ import (
88
networkingv1 "k8s.io/api/networking/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/runtime"
11-
"k8s.io/client-go/kubernetes/fake"
1211
)
1312

14-
func NewFakeKubeClientForIngress(objects ...runtime.Object) *fake.Clientset {
15-
fakeClient := fake.NewSimpleClientset(objects...)
16-
return fakeClient
17-
}
18-
1913
func TestGetIngress(t *testing.T) {
2014

2115
g := gomega.NewGomegaWithT(t)
@@ -28,7 +22,7 @@ func TestGetIngress(t *testing.T) {
2822
},
2923
},
3024
}
31-
fakeClient := NewFakeKubeClientForIngress(fakeIngress...)
25+
fakeClient := NewFakeKubeClientWithObjects(fakeIngress...)
3226

3327
test := With(t).(*T)
3428
test.client = &testClient{

support/machine_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"sigs.k8s.io/controller-runtime/pkg/client"
12-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1312

1413
machinev1beta1 "github.com/openshift/api/machine/v1beta1"
1514
)
1615

17-
func NewFakeKubeClientWithMachines(scheme *runtime.Scheme, objects ...client.Object) client.Client {
18-
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
19-
}
20-
2116
func TestGetMachineSets(t *testing.T) {
2217
g := gomega.NewGomegaWithT(t)
2318

@@ -32,7 +27,7 @@ func TestGetMachineSets(t *testing.T) {
3227
},
3328
},
3429
}
35-
fakeClient := NewFakeKubeClientWithMachines(scheme, testmachines...)
30+
fakeClient := NewFakeKubeClientWithScheme(scheme, testmachines...)
3631

3732
machine := &machinev1beta1.MachineSet{}
3833
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) {
4439

4540
}
4641

47-
4842
/*
4943
import (
5044

support/ocm_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package support
22

33
/*
4-
54
import (
65
"testing"
76
"github.com/onsi/gomega"
@@ -31,5 +30,4 @@ func TestGetMachinePools(t *testing.T) {
3130
machinePools := GetMachinePools(test, &ocmsdk.Connection{})
3231
test.Expect(machinePools).Should(gomega.HaveLen(1), "Expected 1 machine pool, but got %d", len(machinePools))
3332
}
34-
3533
*/

support/ray_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/runtime"
1212
"sigs.k8s.io/controller-runtime/pkg/client"
13-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1413
)
1514

16-
func NewFakeClient(scheme *runtime.Scheme, objects ...client.Object) client.Client {
17-
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
18-
}
19-
2015
func TestGetRayJob(t *testing.T) {
2116
g := gomega.NewGomegaWithT(t)
2217

@@ -32,7 +27,7 @@ func TestGetRayJob(t *testing.T) {
3227
},
3328
}
3429

35-
fakeClient := NewFakeClient(scheme, fakeRayJobs...)
30+
fakeClient := NewFakeKubeClientWithScheme(scheme, fakeRayJobs...)
3631

3732
rayJob := &rayv1alpha1.RayJob{}
3833
err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-job-1", Namespace: "my-namespace"}, rayJob)
@@ -59,7 +54,7 @@ func TestGetRayCluster(t *testing.T) {
5954
},
6055
}
6156

62-
fakeClient := NewFakeClient(scheme, fakeRayCluster...)
57+
fakeClient := NewFakeKubeClientWithScheme(scheme, fakeRayCluster...)
6358

6459
raycluster := &rayv1alpha1.RayCluster{}
6560
err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "my-cluster-1", Namespace: "my-namespace"}, raycluster)

support/route_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"sigs.k8s.io/controller-runtime/pkg/client"
12-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1312

1413
routev1 "github.com/openshift/api/route/v1"
1514
)
1615

17-
func NewFakeKubeClientWithRoute(scheme *runtime.Scheme, objects ...client.Object) client.Client {
18-
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
19-
}
20-
2116
func TestGetRoute(t *testing.T) {
2217

2318
g := gomega.NewGomegaWithT(t)
@@ -33,7 +28,7 @@ func TestGetRoute(t *testing.T) {
3328
},
3429
},
3530
}
36-
fakeClient := NewFakeKubeClientWithRoute(scheme, fakeroute...)
31+
fakeClient := NewFakeKubeClientWithScheme(scheme, fakeroute...)
3732

3833
route := &routev1.Route{}
3934
err := fakeClient.Get(context.TODO(), client.ObjectKey{Name: "test-1", Namespace: "my-namespace"}, route)

0 commit comments

Comments
 (0)