Skip to content

Commit 4895c6d

Browse files
JoelSpeedJoelSpeed
committed
Fix linting issues introduced by bumping openshift/client-go
1 parent 5c7e906 commit 4895c6d

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎pkg/cvo/cvo_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ func TestOperator_sync(t *testing.T) {
433433
VersionHash: "foo",
434434
},
435435
},
436-
client: fake.NewSimpleClientset(
436+
client: fake.NewClientset(
437437
&configv1.ClusterVersion{
438438
ObjectMeta: metav1.ObjectMeta{
439439
Name: "default",
@@ -2036,7 +2036,7 @@ func TestOperator_sync(t *testing.T) {
20362036
},
20372037
namespace: "test",
20382038
name: "default",
2039-
client: fake.NewSimpleClientset(
2039+
client: fake.NewClientset(
20402040
&configv1.ClusterVersion{
20412041
ObjectMeta: metav1.ObjectMeta{
20422042
Name: "default",
@@ -2321,7 +2321,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
23212321
},
23222322
namespace: "test",
23232323
name: "default",
2324-
client: fake.NewSimpleClientset(),
2324+
client: fake.NewClientset(),
23252325
},
23262326
},
23272327
{
@@ -2337,7 +2337,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
23372337
},
23382338
namespace: "test",
23392339
name: "default",
2340-
client: fake.NewSimpleClientset(
2340+
client: fake.NewClientset(
23412341
&configv1.ClusterVersion{
23422342
ObjectMeta: metav1.ObjectMeta{
23432343
Name: "default",
@@ -2380,7 +2380,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
23802380
},
23812381
namespace: "test",
23822382
name: "default",
2383-
client: fake.NewSimpleClientset(
2383+
client: fake.NewClientset(
23842384
&configv1.ClusterVersion{
23852385
ObjectMeta: metav1.ObjectMeta{
23862386
Name: "default",
@@ -2422,7 +2422,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
24222422
},
24232423
namespace: "test",
24242424
name: "default",
2425-
client: fake.NewSimpleClientset(
2425+
client: fake.NewClientset(
24262426
&configv1.ClusterVersion{
24272427
ObjectMeta: metav1.ObjectMeta{
24282428
Name: "default",
@@ -2465,7 +2465,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
24652465
},
24662466
namespace: "test",
24672467
name: "default",
2468-
client: fake.NewSimpleClientset(
2468+
client: fake.NewClientset(
24692469
&configv1.ClusterVersion{
24702470
ObjectMeta: metav1.ObjectMeta{
24712471
Name: "default",
@@ -2528,7 +2528,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
25282528
},
25292529
namespace: "test",
25302530
name: "default",
2531-
client: fake.NewSimpleClientset(
2531+
client: fake.NewClientset(
25322532
&configv1.ClusterVersion{
25332533
ObjectMeta: metav1.ObjectMeta{
25342534
Name: "default",
@@ -2595,7 +2595,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
25952595
},
25962596
namespace: "test",
25972597
name: "default",
2598-
client: fake.NewSimpleClientset(
2598+
client: fake.NewClientset(
25992599
&configv1.ClusterVersion{
26002600
ObjectMeta: metav1.ObjectMeta{
26012601
Name: "default",
@@ -2655,7 +2655,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
26552655
},
26562656
namespace: "test",
26572657
name: "default",
2658-
client: fake.NewSimpleClientset(
2658+
client: fake.NewClientset(
26592659
&configv1.ClusterVersion{
26602660
ObjectMeta: metav1.ObjectMeta{
26612661
Name: "default",
@@ -2696,7 +2696,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
26962696
},
26972697
namespace: "test",
26982698
name: "default",
2699-
client: fake.NewSimpleClientset(
2699+
client: fake.NewClientset(
27002700
&configv1.ClusterVersion{
27012701
ObjectMeta: metav1.ObjectMeta{
27022702
Name: "default",
@@ -2832,7 +2832,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
28322832
},
28332833
namespace: "test",
28342834
name: "default",
2835-
client: fake.NewSimpleClientset(),
2835+
client: fake.NewClientset(),
28362836
},
28372837
cm: corev1.ConfigMap{
28382838
ObjectMeta: metav1.ObjectMeta{Name: "admin-gates",
@@ -2847,7 +2847,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
28472847
},
28482848
namespace: "test",
28492849
name: "default",
2850-
client: fake.NewSimpleClientset(
2850+
client: fake.NewClientset(
28512851
&configv1.ClusterVersion{
28522852
ObjectMeta: metav1.ObjectMeta{
28532853
Name: "default",
@@ -2890,7 +2890,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
28902890
},
28912891
namespace: "test",
28922892
name: "default",
2893-
client: fake.NewSimpleClientset(
2893+
client: fake.NewClientset(
28942894
&configv1.ClusterVersion{
28952895
ObjectMeta: metav1.ObjectMeta{
28962896
Name: "default",
@@ -2943,7 +2943,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
29432943
},
29442944
namespace: "test",
29452945
name: "default",
2946-
client: fake.NewSimpleClientset(
2946+
client: fake.NewClientset(
29472947
&configv1.ClusterVersion{
29482948
ObjectMeta: metav1.ObjectMeta{
29492949
Name: "default",
@@ -3004,7 +3004,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
30043004
},
30053005
namespace: "test",
30063006
name: "default",
3007-
client: fake.NewSimpleClientset(
3007+
client: fake.NewClientset(
30083008
&configv1.ClusterVersion{
30093009
ObjectMeta: metav1.ObjectMeta{
30103010
Name: "default",
@@ -3068,7 +3068,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
30683068
},
30693069
namespace: "test",
30703070
name: "default",
3071-
client: fake.NewSimpleClientset(
3071+
client: fake.NewClientset(
30723072
&configv1.ClusterVersion{
30733073
ObjectMeta: metav1.ObjectMeta{
30743074
Name: "default",
@@ -3134,7 +3134,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
31343134
},
31353135
namespace: "test",
31363136
name: "default",
3137-
client: fake.NewSimpleClientset(
3137+
client: fake.NewClientset(
31383138
&configv1.ClusterVersion{
31393139
ObjectMeta: metav1.ObjectMeta{
31403140
Name: "default",
@@ -3213,7 +3213,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
32133213
},
32143214
namespace: "test",
32153215
name: "default",
3216-
client: fake.NewSimpleClientset(
3216+
client: fake.NewClientset(
32173217
&configv1.ClusterVersion{
32183218
ObjectMeta: metav1.ObjectMeta{
32193219
Name: "default",
@@ -3247,7 +3247,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
32473247
},
32483248
namespace: "test",
32493249
name: "default",
3250-
client: fake.NewSimpleClientset(
3250+
client: fake.NewClientset(
32513251
&configv1.ClusterVersion{
32523252
ObjectMeta: metav1.ObjectMeta{
32533253
Name: "default",
@@ -3283,7 +3283,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
32833283
},
32843284
namespace: "test",
32853285
name: "default",
3286-
client: fake.NewSimpleClientset(
3286+
client: fake.NewClientset(
32873287
&configv1.ClusterVersion{
32883288
ObjectMeta: metav1.ObjectMeta{
32893289
Name: "default",
@@ -3331,7 +3331,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
33313331
},
33323332
namespace: "test",
33333333
name: "default",
3334-
client: fake.NewSimpleClientset(
3334+
client: fake.NewClientset(
33353335
&configv1.ClusterVersion{
33363336
ObjectMeta: metav1.ObjectMeta{
33373337
Name: "default",
@@ -3375,7 +3375,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
33753375
},
33763376
namespace: "test",
33773377
name: "default",
3378-
client: fake.NewSimpleClientset(
3378+
client: fake.NewClientset(
33793379
&configv1.ClusterVersion{
33803380
ObjectMeta: metav1.ObjectMeta{
33813381
Name: "default",
@@ -3419,7 +3419,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
34193419
},
34203420
namespace: "test",
34213421
name: "default",
3422-
client: fake.NewSimpleClientset(
3422+
client: fake.NewClientset(
34233423
&configv1.ClusterVersion{
34243424
ObjectMeta: metav1.ObjectMeta{
34253425
Name: "default",
@@ -3463,7 +3463,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
34633463
},
34643464
namespace: "test",
34653465
name: "default",
3466-
client: fake.NewSimpleClientset(
3466+
client: fake.NewClientset(
34673467
&configv1.ClusterVersion{
34683468
ObjectMeta: metav1.ObjectMeta{
34693469
Name: "default",
@@ -3507,7 +3507,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
35073507
},
35083508
namespace: "test",
35093509
name: "default",
3510-
client: fake.NewSimpleClientset(
3510+
client: fake.NewClientset(
35113511
&configv1.ClusterVersion{
35123512
ObjectMeta: metav1.ObjectMeta{
35133513
Name: "default",
@@ -3552,7 +3552,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
35523552
},
35533553
namespace: "test",
35543554
name: "default",
3555-
client: fake.NewSimpleClientset(
3555+
client: fake.NewClientset(
35563556
&configv1.ClusterVersion{
35573557
ObjectMeta: metav1.ObjectMeta{
35583558
Name: "default",
@@ -3593,7 +3593,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
35933593
},
35943594
namespace: "test",
35953595
name: "default",
3596-
client: fake.NewSimpleClientset(
3596+
client: fake.NewClientset(
35973597
&configv1.ClusterVersion{
35983598
ObjectMeta: metav1.ObjectMeta{
35993599
Name: "default",
@@ -3643,7 +3643,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
36433643
},
36443644
namespace: "test",
36453645
name: "default",
3646-
client: fake.NewSimpleClientset(
3646+
client: fake.NewClientset(
36473647
&configv1.ClusterVersion{
36483648
ObjectMeta: metav1.ObjectMeta{
36493649
Name: "default",
@@ -3688,7 +3688,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
36883688
},
36893689
namespace: "test",
36903690
name: "default",
3691-
client: fake.NewSimpleClientset(
3691+
client: fake.NewClientset(
36923692
&configv1.ClusterVersion{
36933693
ObjectMeta: metav1.ObjectMeta{
36943694
Name: "default",
@@ -3737,7 +3737,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
37373737
},
37383738
namespace: "test",
37393739
name: "default",
3740-
client: fake.NewSimpleClientset(
3740+
client: fake.NewClientset(
37413741
&configv1.ClusterVersion{
37423742
ObjectMeta: metav1.ObjectMeta{
37433743
Name: "default",
@@ -3776,7 +3776,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
37763776
ctx, cancel := context.WithCancel(context.Background())
37773777
defer cancel()
37783778
watcherStarted := make(chan struct{})
3779-
f := kfake.NewSimpleClientset()
3779+
f := kfake.NewClientset()
37803780

37813781
// A catch-all watch reactor that allows us to inject the watcherStarted channel.
37823782
f.PrependWatchReactor("*", func(action ktesting.Action) (handled bool, ret watch.Interface, err error) {

‎pkg/cvo/upgradeable_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func TestUpgradeInProgressUpgradeable(t *testing.T) {
140140
}
141141
for _, tc := range testCases {
142142
t.Run(tc.name, func(t *testing.T) {
143-
client := fake.NewSimpleClientset(tc.cv)
143+
client := fake.NewClientset(tc.cv)
144144
unit := upgradeInProgressUpgradeable{name: "unit-test", cvLister: &clientCVLister{client: client}}
145145
actual := unit.Check()
146146
if diff := cmp.Diff(tc.expected, actual); diff != "" {

0 commit comments

Comments
 (0)