Skip to content

Commit ebfb23b

Browse files
Karthik-K-NKarthik-K-N
committed
Address review comments
1 parent ea44719 commit ebfb23b

File tree

6 files changed

+64
-65
lines changed

6 files changed

+64
-65
lines changed

‎exp/internal/controllers/machinepool_controller_phases_test.go

+43-43
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
29-
"k8s.io/apimachinery/pkg/runtime"
3029
"k8s.io/apimachinery/pkg/types"
3130
"k8s.io/client-go/tools/record"
3231
"k8s.io/utils/ptr"
@@ -38,7 +37,7 @@ import (
3837
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3938
"sigs.k8s.io/cluster-api/controllers/clustercache"
4039
"sigs.k8s.io/cluster-api/controllers/external"
41-
fakeController "sigs.k8s.io/cluster-api/controllers/external/fake"
40+
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
4241
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4342
"sigs.k8s.io/cluster-api/internal/test/builder"
4443
"sigs.k8s.io/cluster-api/internal/util/ssa"
@@ -132,9 +131,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
132131
Client: fakeClient,
133132
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
134133
externalTracker: external.ObjectTracker{
135-
Controller: fakeController.Controller{},
134+
Controller: externalfake.Controller{},
136135
Cache: &informertest.FakeInformers{},
137-
Scheme: runtime.NewScheme(),
136+
Scheme: fakeClient.Scheme(),
138137
},
139138
}
140139

@@ -174,9 +173,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
174173
Client: fakeClient,
175174
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
176175
externalTracker: external.ObjectTracker{
177-
Controller: fakeController.Controller{},
176+
Controller: externalfake.Controller{},
178177
Cache: &informertest.FakeInformers{},
179-
Scheme: runtime.NewScheme(),
178+
Scheme: fakeClient.Scheme(),
180179
},
181180
}
182181

@@ -213,9 +212,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
213212
Client: fakeClient,
214213
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
215214
externalTracker: external.ObjectTracker{
216-
Controller: fakeController.Controller{},
215+
Controller: externalfake.Controller{},
217216
Cache: &informertest.FakeInformers{},
218-
Scheme: runtime.NewScheme(),
217+
Scheme: fakeClient.Scheme(),
219218
},
220219
}
221220

@@ -268,9 +267,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
268267
Client: fakeClient,
269268
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
270269
externalTracker: external.ObjectTracker{
271-
Controller: fakeController.Controller{},
270+
Controller: externalfake.Controller{},
272271
Cache: &informertest.FakeInformers{},
273-
Scheme: runtime.NewScheme(),
272+
Scheme: fakeClient.Scheme(),
274273
},
275274
}
276275

@@ -335,9 +334,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
335334
Client: fakeClient,
336335
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
337336
externalTracker: external.ObjectTracker{
338-
Controller: fakeController.Controller{},
337+
Controller: externalfake.Controller{},
339338
Cache: &informertest.FakeInformers{},
340-
Scheme: runtime.NewScheme(),
339+
Scheme: fakeClient.Scheme(),
341340
},
342341
}
343342

@@ -380,9 +379,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
380379
Client: fakeClient,
381380
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
382381
externalTracker: external.ObjectTracker{
383-
Controller: fakeController.Controller{},
382+
Controller: externalfake.Controller{},
384383
Cache: &informertest.FakeInformers{},
385-
Scheme: runtime.NewScheme(),
384+
Scheme: fakeClient.Scheme(),
386385
},
387386
}
388387

@@ -432,9 +431,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
432431
Client: fakeClient,
433432
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
434433
externalTracker: external.ObjectTracker{
435-
Controller: fakeController.Controller{},
434+
Controller: externalfake.Controller{},
436435
Cache: &informertest.FakeInformers{},
437-
Scheme: runtime.NewScheme(),
436+
Scheme: fakeClient.Scheme(),
438437
},
439438
}
440439

@@ -497,9 +496,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
497496
Client: fakeClient,
498497
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
499498
externalTracker: external.ObjectTracker{
500-
Controller: fakeController.Controller{},
499+
Controller: externalfake.Controller{},
501500
Cache: &informertest.FakeInformers{},
502-
Scheme: runtime.NewScheme(),
501+
Scheme: fakeClient.Scheme(),
503502
},
504503
}
505504

@@ -568,9 +567,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
568567
Client: fakeClient,
569568
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
570569
externalTracker: external.ObjectTracker{
571-
Controller: fakeController.Controller{},
570+
Controller: externalfake.Controller{},
572571
Cache: &informertest.FakeInformers{},
573-
Scheme: runtime.NewScheme(),
572+
Scheme: fakeClient.Scheme(),
574573
},
575574
}
576575

@@ -637,9 +636,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
637636
Client: fakeClient,
638637
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
639638
externalTracker: external.ObjectTracker{
640-
Controller: fakeController.Controller{},
639+
Controller: externalfake.Controller{},
641640
Cache: &informertest.FakeInformers{},
642-
Scheme: runtime.NewScheme(),
641+
Scheme: fakeClient.Scheme(),
643642
},
644643
}
645644

@@ -728,9 +727,9 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
728727
Client: fakeClient,
729728
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
730729
externalTracker: external.ObjectTracker{
731-
Controller: fakeController.Controller{},
730+
Controller: externalfake.Controller{},
732731
Cache: &informertest.FakeInformers{},
733-
Scheme: runtime.NewScheme(),
732+
Scheme: fakeClient.Scheme(),
734733
},
735734
}
736735

@@ -1046,12 +1045,13 @@ func TestReconcileMachinePoolBootstrap(t *testing.T) {
10461045
}
10471046

10481047
bootstrapConfig := &unstructured.Unstructured{Object: tc.bootstrapConfig}
1048+
fakeClient := fake.NewClientBuilder().WithObjects(tc.machinepool, bootstrapConfig, builder.TestBootstrapConfigCRD, builder.TestInfrastructureMachineTemplateCRD).Build()
10491049
r := &MachinePoolReconciler{
1050-
Client: fake.NewClientBuilder().WithObjects(tc.machinepool, bootstrapConfig, builder.TestBootstrapConfigCRD, builder.TestInfrastructureMachineTemplateCRD).Build(),
1050+
Client: fakeClient,
10511051
externalTracker: external.ObjectTracker{
1052-
Controller: fakeController.Controller{},
1052+
Controller: externalfake.Controller{},
10531053
Cache: &informertest.FakeInformers{},
1054-
Scheme: runtime.NewScheme(),
1054+
Scheme: fakeClient.Scheme(),
10551055
},
10561056
}
10571057

@@ -1349,9 +1349,9 @@ func TestReconcileMachinePoolInfrastructure(t *testing.T) {
13491349
Client: fakeClient,
13501350
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: defaultCluster.Name, Namespace: defaultCluster.Namespace}),
13511351
externalTracker: external.ObjectTracker{
1352-
Controller: fakeController.Controller{},
1352+
Controller: externalfake.Controller{},
13531353
Cache: &informertest.FakeInformers{},
1354-
Scheme: runtime.NewScheme(),
1354+
Scheme: fakeClient.Scheme(),
13551355
},
13561356
}
13571357

@@ -1437,9 +1437,9 @@ func TestReconcileMachinePoolMachines(t *testing.T) {
14371437
Client: env,
14381438
ssaCache: ssa.NewCache(),
14391439
externalTracker: external.ObjectTracker{
1440-
Controller: fakeController.Controller{},
1440+
Controller: externalfake.Controller{},
14411441
Cache: &informertest.FakeInformers{},
1442-
Scheme: runtime.NewScheme(),
1442+
Scheme: env.Scheme(),
14431443
},
14441444
}
14451445
scope := &scope{
@@ -1505,9 +1505,9 @@ func TestReconcileMachinePoolMachines(t *testing.T) {
15051505
Client: env,
15061506
ssaCache: ssa.NewCache(),
15071507
externalTracker: external.ObjectTracker{
1508-
Controller: fakeController.Controller{},
1508+
Controller: externalfake.Controller{},
15091509
Cache: &informertest.FakeInformers{},
1510-
Scheme: runtime.NewScheme(),
1510+
Scheme: env.Scheme(),
15111511
},
15121512
}
15131513

@@ -1868,9 +1868,9 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
18681868
ClusterCache: clustercache.NewFakeClusterCache(env.GetClient(), client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
18691869
recorder: record.NewFakeRecorder(32),
18701870
externalTracker: external.ObjectTracker{
1871-
Controller: fakeController.Controller{},
1871+
Controller: externalfake.Controller{},
18721872
Cache: &informertest.FakeInformers{},
1873-
Scheme: runtime.NewScheme(),
1873+
Scheme: fakeClient.Scheme(),
18741874
},
18751875
}
18761876

@@ -1935,9 +1935,9 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
19351935
ClusterCache: clustercache.NewFakeClusterCache(env.GetClient(), client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
19361936
recorder: record.NewFakeRecorder(32),
19371937
externalTracker: external.ObjectTracker{
1938-
Controller: fakeController.Controller{},
1938+
Controller: externalfake.Controller{},
19391939
Cache: &informertest.FakeInformers{},
1940-
Scheme: runtime.NewScheme(),
1940+
Scheme: fakeClient.Scheme(),
19411941
},
19421942
}
19431943

@@ -1985,9 +1985,9 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
19851985
recorder: record.NewFakeRecorder(32),
19861986
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
19871987
externalTracker: external.ObjectTracker{
1988-
Controller: fakeController.Controller{},
1988+
Controller: externalfake.Controller{},
19891989
Cache: &informertest.FakeInformers{},
1990-
Scheme: runtime.NewScheme(),
1990+
Scheme: fakeClient.Scheme(),
19911991
},
19921992
}
19931993

@@ -2031,9 +2031,9 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
20312031
recorder: record.NewFakeRecorder(32),
20322032
ClusterCache: clustercache.NewFakeClusterCache(fakeClient, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
20332033
externalTracker: external.ObjectTracker{
2034-
Controller: fakeController.Controller{},
2034+
Controller: externalfake.Controller{},
20352035
Cache: &informertest.FakeInformers{},
2036-
Scheme: runtime.NewScheme(),
2036+
Scheme: fakeClient.Scheme(),
20372037
},
20382038
}
20392039

@@ -2099,9 +2099,9 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
20992099
ClusterCache: clustercache.NewFakeClusterCache(env.GetClient(), client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
21002100
recorder: record.NewFakeRecorder(32),
21012101
externalTracker: external.ObjectTracker{
2102-
Controller: fakeController.Controller{},
2102+
Controller: externalfake.Controller{},
21032103
Cache: &informertest.FakeInformers{},
2104-
Scheme: runtime.NewScheme(),
2104+
Scheme: fakeClient.Scheme(),
21052105
},
21062106
}
21072107

‎exp/internal/controllers/machinepool_controller_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
4242
"sigs.k8s.io/cluster-api/controllers/clustercache"
4343
"sigs.k8s.io/cluster-api/controllers/external"
44-
fakeController "sigs.k8s.io/cluster-api/controllers/external/fake"
44+
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
4545
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4646
"sigs.k8s.io/cluster-api/internal/test/builder"
4747
"sigs.k8s.io/cluster-api/util"
@@ -601,9 +601,9 @@ func TestReconcileMachinePoolRequest(t *testing.T) {
601601
APIReader: clientFake,
602602
ClusterCache: clustercache.NewFakeClusterCache(trackerClientFake, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
603603
externalTracker: external.ObjectTracker{
604-
Controller: fakeController.Controller{},
604+
Controller: externalfake.Controller{},
605605
Cache: &informertest.FakeInformers{},
606-
Scheme: runtime.NewScheme(),
606+
Scheme: clientFake.Scheme(),
607607
},
608608
}
609609

@@ -1165,9 +1165,9 @@ func TestMachinePoolConditions(t *testing.T) {
11651165
APIReader: clientFake,
11661166
ClusterCache: clustercache.NewFakeClusterCache(clientFake, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
11671167
externalTracker: external.ObjectTracker{
1168-
Controller: fakeController.Controller{},
1168+
Controller: externalfake.Controller{},
11691169
Cache: &informertest.FakeInformers{},
1170-
Scheme: runtime.NewScheme(),
1170+
Scheme: clientFake.Scheme(),
11711171
},
11721172
}
11731173

‎internal/controllers/cluster/cluster_controller_phases_test.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
corev1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
27-
"k8s.io/apimachinery/pkg/runtime"
2827
"k8s.io/client-go/tools/record"
2928
ctrl "sigs.k8s.io/controller-runtime"
3029
"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
@@ -33,7 +32,7 @@ import (
3332

3433
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3534
"sigs.k8s.io/cluster-api/controllers/external"
36-
fakeController "sigs.k8s.io/cluster-api/controllers/external/fake"
35+
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
3736
capierrors "sigs.k8s.io/cluster-api/errors"
3837
"sigs.k8s.io/cluster-api/internal/test/builder"
3938
"sigs.k8s.io/cluster-api/util/conditions"
@@ -210,9 +209,9 @@ func TestClusterReconcilePhases(t *testing.T) {
210209
Client: c,
211210
recorder: record.NewFakeRecorder(32),
212211
externalTracker: external.ObjectTracker{
213-
Controller: fakeController.Controller{},
212+
Controller: externalfake.Controller{},
214213
Cache: &informertest.FakeInformers{},
215-
Scheme: runtime.NewScheme(),
214+
Scheme: c.Scheme(),
216215
},
217216
}
218217

@@ -406,9 +405,9 @@ func TestClusterReconcilePhases(t *testing.T) {
406405
Client: c,
407406
recorder: record.NewFakeRecorder(32),
408407
externalTracker: external.ObjectTracker{
409-
Controller: fakeController.Controller{},
408+
Controller: externalfake.Controller{},
410409
Cache: &informertest.FakeInformers{},
411-
Scheme: runtime.NewScheme(),
410+
Scheme: c.Scheme(),
412411
},
413412
}
414413

@@ -783,9 +782,9 @@ func TestClusterReconcilePhases_reconcileFailureDomains(t *testing.T) {
783782
Client: c,
784783
recorder: record.NewFakeRecorder(32),
785784
externalTracker: external.ObjectTracker{
786-
Controller: fakeController.Controller{},
785+
Controller: externalfake.Controller{},
787786
Cache: &informertest.FakeInformers{},
788-
Scheme: runtime.NewScheme(),
787+
Scheme: c.Scheme(),
789788
},
790789
}
791790

‎internal/controllers/machine/machine_controller_phases_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3535
"sigs.k8s.io/cluster-api/controllers/external"
36-
fakeController "sigs.k8s.io/cluster-api/controllers/external/fake"
36+
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
3737
"sigs.k8s.io/cluster-api/internal/test/builder"
3838
)
3939

@@ -304,7 +304,7 @@ func TestReconcileBootstrap(t *testing.T) {
304304
r := &Reconciler{
305305
Client: c,
306306
externalTracker: external.ObjectTracker{
307-
Controller: fakeController.Controller{},
307+
Controller: externalfake.Controller{},
308308
Cache: &informertest.FakeInformers{},
309309
Scheme: runtime.NewScheme(),
310310
},
@@ -861,9 +861,9 @@ func TestReconcileInfrastructure(t *testing.T) {
861861
r := &Reconciler{
862862
Client: c,
863863
externalTracker: external.ObjectTracker{
864-
Controller: fakeController.Controller{},
864+
Controller: externalfake.Controller{},
865865
Cache: &informertest.FakeInformers{},
866-
Scheme: runtime.NewScheme(),
866+
Scheme: c.Scheme(),
867867
},
868868
}
869869
s := &scope{cluster: defaultCluster, machine: tc.machine}

‎internal/controllers/machine/machine_controller_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,8 @@ func TestMachineConditions(t *testing.T) {
12411241
Controller: externalfake.Controller{},
12421242
Cache: &informertest.FakeInformers{},
12431243
Scheme: clientFake.Scheme(),
1244-
}}
1244+
},
1245+
}
12451246

12461247
_, err := r.Reconcile(ctx, reconcile.Request{NamespacedName: util.ObjectKey(&machine)})
12471248
if tt.wantErr {

0 commit comments

Comments
 (0)