Skip to content

Commit 7e0ad9c

Browse files
AshleyDumaineAshleyDumaine
authored
Merge pull request #487 from linode/fix-deprecation-warnings
[improvement] switch from fake.NewSimpleClientset to fake.NewClientset
2 parents ca2eaf3 + 5883b7d commit 7e0ad9c

File tree

5 files changed

+52
-52
lines changed

5 files changed

+52
-52
lines changed

‎cloud/linode/loadbalancers_test.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ func testCreateNodeBalancerWithNodeNoAddresses(t *testing.T, client *linodego.Cl
504504
if !assertion {
505505
t.Error("type assertion failed")
506506
}
507-
fakeClientset := fake.NewSimpleClientset()
507+
fakeClientset := fake.NewClientset()
508508
lb.kubeClient = fakeClientset
509509

510510
defer func() {
@@ -736,7 +736,7 @@ func testUpdateNodeBalancerWithVPCBackend(t *testing.T, client *linodego.Client,
736736
if !assertion {
737737
t.Error("type assertion failed")
738738
}
739-
fakeClientset := fake.NewSimpleClientset()
739+
fakeClientset := fake.NewClientset()
740740
lb.kubeClient = fakeClientset
741741

742742
defer func() {
@@ -825,7 +825,7 @@ func testCreateNodeBalancerWithVPCOnlySubnetFlag(t *testing.T, client *linodego.
825825
if !assertion {
826826
t.Error("type assertion failed")
827827
}
828-
fakeClientset := fake.NewSimpleClientset()
828+
fakeClientset := fake.NewClientset()
829829
lb.kubeClient = fakeClientset
830830

831831
defer func() {
@@ -920,7 +920,7 @@ func testCreateNodeBalancerWithVPCNoFlagOrAnnotation(t *testing.T, client *linod
920920
if !assertion {
921921
t.Error("type assertion failed")
922922
}
923-
fakeClientset := fake.NewSimpleClientset()
923+
fakeClientset := fake.NewClientset()
924924
lb.kubeClient = fakeClientset
925925

926926
defer func() {
@@ -1011,7 +1011,7 @@ func testCreateNodeBalancerWithVPCAnnotationOnly(t *testing.T, client *linodego.
10111011
if !assertion {
10121012
t.Error("type assertion failed")
10131013
}
1014-
fakeClientset := fake.NewSimpleClientset()
1014+
fakeClientset := fake.NewClientset()
10151015
lb.kubeClient = fakeClientset
10161016

10171017
defer func() {
@@ -1098,7 +1098,7 @@ func testCreateNodeBalancerWithVPCOnlySubnetIDFlag(t *testing.T, client *linodeg
10981098
if !assertion {
10991099
t.Error("type assertion failed")
11001100
}
1101-
fakeClientset := fake.NewSimpleClientset()
1101+
fakeClientset := fake.NewClientset()
11021102
lb.kubeClient = fakeClientset
11031103

11041104
defer func() {
@@ -1246,7 +1246,7 @@ func testUpdateLoadBalancerAddNode(t *testing.T, client *linodego.Client, f *fak
12461246
if !assertion {
12471247
t.Error("type assertion failed")
12481248
}
1249-
fakeClientset := fake.NewSimpleClientset()
1249+
fakeClientset := fake.NewClientset()
12501250
lb.kubeClient = fakeClientset
12511251

12521252
defer func() {
@@ -1413,7 +1413,7 @@ func testUpdateLoadBalancerAddAnnotation(t *testing.T, client *linodego.Client,
14131413
if !assertion {
14141414
t.Error("type assertion failed")
14151415
}
1416-
fakeClientset := fake.NewSimpleClientset()
1416+
fakeClientset := fake.NewClientset()
14171417
lb.kubeClient = fakeClientset
14181418

14191419
defer func() {
@@ -1490,7 +1490,7 @@ func testUpdateLoadBalancerAddPortAnnotation(t *testing.T, client *linodego.Clie
14901490
if !assertion {
14911491
t.Error("type assertion failed")
14921492
}
1493-
fakeClientset := fake.NewSimpleClientset()
1493+
fakeClientset := fake.NewClientset()
14941494
lb.kubeClient = fakeClientset
14951495

14961496
defer func() {
@@ -1605,7 +1605,7 @@ func testVeryLongServiceName(t *testing.T, client *linodego.Client, _ *fakeAPI)
16051605
if !assertion {
16061606
t.Error("type assertion failed")
16071607
}
1608-
fakeClientset := fake.NewSimpleClientset()
1608+
fakeClientset := fake.NewClientset()
16091609
lb.kubeClient = fakeClientset
16101610

16111611
defer func() {
@@ -1675,7 +1675,7 @@ func testUpdateLoadBalancerAddTags(t *testing.T, client *linodego.Client, _ *fak
16751675
if !assertion {
16761676
t.Error("type assertion failed")
16771677
}
1678-
fakeClientset := fake.NewSimpleClientset()
1678+
fakeClientset := fake.NewClientset()
16791679
lb.kubeClient = fakeClientset
16801680
clusterName := "linodelb"
16811681

@@ -1767,7 +1767,7 @@ func testUpdateLoadBalancerAddTLSPort(t *testing.T, client *linodego.Client, _ *
17671767
_ = lb.EnsureLoadBalancerDeleted(t.Context(), "linodelb", svc)
17681768
}()
17691769

1770-
fakeClientset := fake.NewSimpleClientset()
1770+
fakeClientset := fake.NewClientset()
17711771
lb.kubeClient = fakeClientset
17721772
addTLSSecret(t, lb.kubeClient)
17731773

@@ -1845,7 +1845,7 @@ func testUpdateLoadBalancerAddProxyProtocol(t *testing.T, client *linodego.Clien
18451845
if !assertion {
18461846
t.Error("type assertion failed")
18471847
}
1848-
fakeClientset := fake.NewSimpleClientset()
1848+
fakeClientset := fake.NewClientset()
18491849
lb.kubeClient = fakeClientset
18501850

18511851
for _, tc := range []struct {
@@ -1973,7 +1973,7 @@ func testUpdateLoadBalancerAddNewFirewall(t *testing.T, client *linodego.Client,
19731973
if !assertion {
19741974
t.Error("type assertion failed")
19751975
}
1976-
fakeClientset := fake.NewSimpleClientset()
1976+
fakeClientset := fake.NewClientset()
19771977
lb.kubeClient = fakeClientset
19781978

19791979
defer func() {
@@ -2076,7 +2076,7 @@ func testUpdateLoadBalancerAddNewFirewallACL(t *testing.T, client *linodego.Clie
20762076
if !assertion {
20772077
t.Error("type assertion failed")
20782078
}
2079-
fakeClientset := fake.NewSimpleClientset()
2079+
fakeClientset := fake.NewClientset()
20802080
lb.kubeClient = fakeClientset
20812081

20822082
defer func() {
@@ -2210,7 +2210,7 @@ func testUpdateLoadBalancerDeleteFirewallRemoveACL(t *testing.T, client *linodeg
22102210
if !assertion {
22112211
t.Error("type assertion failed")
22122212
}
2213-
fakeClientset := fake.NewSimpleClientset()
2213+
fakeClientset := fake.NewClientset()
22142214
lb.kubeClient = fakeClientset
22152215

22162216
svc.SetAnnotations(map[string]string{
@@ -2311,7 +2311,7 @@ func testUpdateLoadBalancerUpdateFirewallRemoveACLaddID(t *testing.T, client *li
23112311
if !assertion {
23122312
t.Error("type assertion failed")
23132313
}
2314-
fakeClientset := fake.NewSimpleClientset()
2314+
fakeClientset := fake.NewClientset()
23152315
lb.kubeClient = fakeClientset
23162316

23172317
svc.SetAnnotations(map[string]string{
@@ -2453,7 +2453,7 @@ func testUpdateLoadBalancerUpdateFirewallRemoveIDaddACL(t *testing.T, client *li
24532453
if !assertion {
24542454
t.Error("type assertion failed")
24552455
}
2456-
fakeClientset := fake.NewSimpleClientset()
2456+
fakeClientset := fake.NewClientset()
24572457
lb.kubeClient = fakeClientset
24582458

24592459
fwClient := services.LinodeClient{Client: client}
@@ -2602,7 +2602,7 @@ func testUpdateLoadBalancerUpdateFirewallACL(t *testing.T, client *linodego.Clie
26022602
if !assertion {
26032603
t.Error("type assertion failed")
26042604
}
2605-
fakeClientset := fake.NewSimpleClientset()
2605+
fakeClientset := fake.NewClientset()
26062606
lb.kubeClient = fakeClientset
26072607

26082608
defer func() {
@@ -2840,7 +2840,7 @@ func testUpdateLoadBalancerUpdateFirewall(t *testing.T, client *linodego.Client,
28402840
if !assertion {
28412841
t.Error("type assertion failed")
28422842
}
2843-
fakeClientset := fake.NewSimpleClientset()
2843+
fakeClientset := fake.NewClientset()
28442844
lb.kubeClient = fakeClientset
28452845

28462846
defer func() {
@@ -2975,7 +2975,7 @@ func testUpdateLoadBalancerDeleteFirewallRemoveID(t *testing.T, client *linodego
29752975
if !assertion {
29762976
t.Error("type assertion failed")
29772977
}
2978-
fakeClientset := fake.NewSimpleClientset()
2978+
fakeClientset := fake.NewClientset()
29792979
lb.kubeClient = fakeClientset
29802980

29812981
defer func() {
@@ -3084,7 +3084,7 @@ func testUpdateLoadBalancerAddReservedIP(t *testing.T, client *linodego.Client,
30843084
_ = lb.EnsureLoadBalancerDeleted(t.Context(), clusterName, svc)
30853085
}()
30863086

3087-
fakeClientset := fake.NewSimpleClientset()
3087+
fakeClientset := fake.NewClientset()
30883088
lb.kubeClient = fakeClientset
30893089

30903090
nodeBalancer, err := client.CreateNodeBalancer(t.Context(), linodego.NodeBalancerCreateOptions{
@@ -3175,7 +3175,7 @@ func testUpdateLoadBalancerAddNodeBalancerID(t *testing.T, client *linodego.Clie
31753175
_ = lb.EnsureLoadBalancerDeleted(t.Context(), "linodelb", svc)
31763176
}()
31773177

3178-
fakeClientset := fake.NewSimpleClientset()
3178+
fakeClientset := fake.NewClientset()
31793179
lb.kubeClient = fakeClientset
31803180

31813181
nodeBalancer, err := client.CreateNodeBalancer(t.Context(), linodego.NodeBalancerCreateOptions{
@@ -4363,7 +4363,7 @@ func testEnsureExistingLoadBalancer(t *testing.T, client *linodego.Client, _ *fa
43634363
if !assertion {
43644364
t.Error("type assertion failed")
43654365
}
4366-
lb.kubeClient = fake.NewSimpleClientset()
4366+
lb.kubeClient = fake.NewClientset()
43674367
addTLSSecret(t, lb.kubeClient)
43684368

43694369
configs := []*linodego.NodeBalancerConfigCreateOptions{}
@@ -4699,7 +4699,7 @@ func testUpdateLoadBalancerNoNodes(t *testing.T, client *linodego.Client, _ *fak
46994699
_ = lb.EnsureLoadBalancerDeleted(t.Context(), "linodelb", svc)
47004700
}()
47014701

4702-
fakeClientset := fake.NewSimpleClientset()
4702+
fakeClientset := fake.NewClientset()
47034703
lb.kubeClient = fakeClientset
47044704

47054705
nodeBalancer, err := client.CreateNodeBalancer(t.Context(), linodego.NodeBalancerCreateOptions{
@@ -4733,7 +4733,7 @@ func testGetNodeBalancerByStatus(t *testing.T, client *linodego.Client, _ *fakeA
47334733
if !assertion {
47344734
t.Error("type assertion failed")
47354735
}
4736-
fakeClientset := fake.NewSimpleClientset()
4736+
fakeClientset := fake.NewClientset()
47374737
lb.kubeClient = fakeClientset
47384738

47394739
for _, test := range []struct {
@@ -4941,7 +4941,7 @@ func testEnsureNewLoadBalancer(t *testing.T, client *linodego.Client, _ *fakeAPI
49414941
if !assertion {
49424942
t.Error("type assertion failed")
49434943
}
4944-
lb.kubeClient = fake.NewSimpleClientset()
4944+
lb.kubeClient = fake.NewClientset()
49454945
addTLSSecret(t, lb.kubeClient)
49464946

49474947
defer func() { _ = lb.EnsureLoadBalancerDeleted(t.Context(), "linodelb", svc) }()
@@ -5022,7 +5022,7 @@ func testGetLoadBalancer(t *testing.T, client *linodego.Client, _ *fakeAPI) {
50225022
if err != nil {
50235023
t.Fatal(err)
50245024
}
5025-
fakeClientset := fake.NewSimpleClientset()
5025+
fakeClientset := fake.NewClientset()
50265026
lb.kubeClient = fakeClientset
50275027

50285028
defer func() { _ = lb.EnsureLoadBalancerDeleted(t.Context(), "linodelb", svc) }()
@@ -5161,7 +5161,7 @@ func Test_getPortConfigAnnotation(t *testing.T) {
51615161
}
51625162

51635163
func Test_getTLSCertInfo(t *testing.T) {
5164-
kubeClient := fake.NewSimpleClientset()
5164+
kubeClient := fake.NewClientset()
51655165
addTLSSecret(t, kubeClient)
51665166

51675167
testcases := []struct {

‎cloud/linode/node_controller_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestNodeController_Run(t *testing.T) {
2727
ctrl := gomock.NewController(t)
2828
defer ctrl.Finish()
2929
client := mocks.NewMockClient(ctrl)
30-
kubeClient := fake.NewSimpleClientset()
30+
kubeClient := fake.NewClientset()
3131
informer := informers.NewSharedInformerFactory(kubeClient, 0).Core().V1().Nodes()
3232
mockQueue := workqueue.NewTypedDelayingQueueWithConfig(workqueue.TypedDelayingQueueConfig[nodeRequest]{Name: "test"})
3333

@@ -68,7 +68,7 @@ func TestNodeController_processNext(t *testing.T) {
6868
ctrl := gomock.NewController(t)
6969
defer ctrl.Finish()
7070
client := mocks.NewMockClient(ctrl)
71-
kubeClient := fake.NewSimpleClientset()
71+
kubeClient := fake.NewClientset()
7272
queue := workqueue.NewTypedDelayingQueueWithConfig(workqueue.TypedDelayingQueueConfig[nodeRequest]{Name: "testQueue"})
7373
node := &v1.Node{
7474
ObjectMeta: metav1.ObjectMeta{
@@ -155,7 +155,7 @@ func TestNodeController_processNext(t *testing.T) {
155155

156156
t.Run("should return no error if node in k8s doesn't exist", func(t *testing.T) {
157157
controller.addNodeToQueue(node)
158-
controller.kubeclient = fake.NewSimpleClientset()
158+
controller.kubeclient = fake.NewClientset()
159159
defer func() { controller.kubeclient = kubeClient }()
160160
result := controller.processNext()
161161
assert.True(t, result, "processNext should return true")
@@ -202,7 +202,7 @@ func TestNodeController_handleNode(t *testing.T) {
202202
ctrl := gomock.NewController(t)
203203
defer ctrl.Finish()
204204
client := mocks.NewMockClient(ctrl)
205-
kubeClient := fake.NewSimpleClientset()
205+
kubeClient := fake.NewClientset()
206206
node := &v1.Node{
207207
ObjectMeta: metav1.ObjectMeta{
208208
Name: "test-node",

‎cloud/linode/nodeipamcontroller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func Test_startNodeIpamController(t *testing.T) {
134134
allocateNodeCIDRs bool
135135
clusterCIDR string
136136
}
137-
kubeClient := fake.NewSimpleClientset()
137+
kubeClient := fake.NewClientset()
138138
tests := []struct {
139139
name string
140140
args args

‎cloud/linode/service_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func Test_serviceController_Run(t *testing.T) {
2121
ctrl := gomock.NewController(t)
2222
defer ctrl.Finish()
2323
client := mocks.NewMockClient(ctrl)
24-
kubeClient := fake.NewSimpleClientset()
24+
kubeClient := fake.NewClientset()
2525
informer := informers.NewSharedInformerFactory(kubeClient, 0).Core().V1().Services()
2626
mockQueue := workqueue.NewTypedDelayingQueueWithConfig(workqueue.TypedDelayingQueueConfig[any]{Name: "test"})
2727

0 commit comments

Comments
 (0)