Skip to content

Commit 8a80636

Browse files
sbueringersbueringer
committed
Bump CR again & fix managedField unit tests
1 parent c2af275 commit 8a80636

File tree

12 files changed

+44
-36
lines changed

12 files changed

+44
-36
lines changed

‎exp/topology/desiredstate/desired_state_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,10 +1220,9 @@ func TestComputeControlPlaneVersion(t *testing.T) {
12201220
{
12211221
APIVersion: builder.InfrastructureGroupVersion.String(),
12221222
Manager: "manager",
1223-
Operation: "op",
1223+
Operation: "Apply",
12241224
Time: ptr.To(metav1.Now()),
12251225
FieldsType: "FieldsV1",
1226-
FieldsV1: &metav1.FieldsV1{},
12271226
},
12281227
},
12291228
Annotations: map[string]string{
@@ -1565,10 +1564,9 @@ func TestComputeControlPlaneVersion(t *testing.T) {
15651564
{
15661565
APIVersion: builder.InfrastructureGroupVersion.String(),
15671566
Manager: "manager",
1568-
Operation: "op",
1567+
Operation: "Apply",
15691568
Time: ptr.To(metav1.Now()),
15701569
FieldsType: "FieldsV1",
1571-
FieldsV1: &metav1.FieldsV1{},
15721570
},
15731571
})
15741572
if tt.s.Current.Cluster.Annotations == nil {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
k8s.io/klog/v2 v2.130.1
5050
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
5151
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
52-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed
52+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31
5353
sigs.k8s.io/randfill v1.0.0
5454
sigs.k8s.io/yaml v1.6.0
5555
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
606606
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
607607
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
608608
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
609-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed h1:NrsJjgJDRmiYeuqRF4qCXnPKJQmXqLllMOpyVi0iFsI=
610-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed/go.mod h1:LjUyR9UOOF+gtX64YtT4D5tYdcrmQv1wS7L+SRE4T5g=
609+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31 h1:ttWlwypzv2HeC4G5sMVKFTd7K45qlstdDefL04aMFkU=
610+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31/go.mod h1:LjUyR9UOOF+gtX64YtT4D5tYdcrmQv1wS7L+SRE4T5g=
611611
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
612612
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
613613
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

‎hack/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2727
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
2828
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
29-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed
29+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31
3030
sigs.k8s.io/controller-tools v0.18.0
3131
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d
3232
sigs.k8s.io/kustomize/api v0.17.3

‎hack/tools/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
542542
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
543543
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
544544
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
545-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed h1:NrsJjgJDRmiYeuqRF4qCXnPKJQmXqLllMOpyVi0iFsI=
546-
sigs.k8s.io/controller-runtime v0.21.1-0.20250813191507-c7df6d0236ed/go.mod h1:LjUyR9UOOF+gtX64YtT4D5tYdcrmQv1wS7L+SRE4T5g=
545+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31 h1:ttWlwypzv2HeC4G5sMVKFTd7K45qlstdDefL04aMFkU=
546+
sigs.k8s.io/controller-runtime v0.21.1-0.20250818110513-3554729cfb31/go.mod h1:LjUyR9UOOF+gtX64YtT4D5tYdcrmQv1wS7L+SRE4T5g=
547547
sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=
548548
sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
549549
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎internal/controllers/machineset/machineset_controller_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,10 @@ func TestMachineSetReconcile_MachinesCreatedConditionFalseOnBadInfraRef(t *testi
10021002
request := reconcile.Request{
10031003
NamespacedName: key,
10041004
}
1005-
fakeClient := fake.NewClientBuilder().WithObjects(cluster, ms, builder.GenericInfrastructureMachineTemplateCRD.DeepCopy()).WithStatusSubresource(&clusterv1.MachineSet{}).Build()
1005+
scheme := runtime.NewScheme()
1006+
g.Expect(apiextensionsv1.AddToScheme(scheme)).To(Succeed())
1007+
g.Expect(clusterv1.AddToScheme(scheme)).To(Succeed())
1008+
fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(cluster, ms, builder.GenericInfrastructureMachineTemplateCRD.DeepCopy()).WithStatusSubresource(&clusterv1.MachineSet{}).Build()
10061009

10071010
msr := &Reconciler{
10081011
Client: fakeClient,

‎internal/controllers/topology/cluster/cluster_controller_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,9 @@ func TestClusterReconciler_reconcileDelete(t *testing.T) {
568568
{
569569
APIVersion: builder.InfrastructureGroupVersion.String(),
570570
Manager: "manager",
571-
Operation: "op",
571+
Operation: "Apply",
572572
Time: ptr.To(metav1.Now()),
573573
FieldsType: "FieldsV1",
574-
FieldsV1: &metav1.FieldsV1{},
575574
},
576575
})
577576
if tt.cluster.Annotations == nil {
@@ -739,10 +738,9 @@ func TestReconciler_callBeforeClusterCreateHook(t *testing.T) {
739738
{
740739
APIVersion: builder.InfrastructureGroupVersion.String(),
741740
Manager: "manager",
742-
Operation: "op",
741+
Operation: "Apply",
743742
Time: ptr.To(metav1.Now()),
744743
FieldsType: "FieldsV1",
745-
FieldsV1: &metav1.FieldsV1{},
746744
},
747745
},
748746
Annotations: map[string]string{

‎internal/controllers/topology/cluster/patches/template_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ func TestRequestItemBuilder(t *testing.T) {
5252
{
5353
APIVersion: builder.InfrastructureGroupVersion.String(),
5454
Manager: "manager",
55-
Operation: "op",
55+
Operation: "Apply",
5656
Time: ptr.To(metav1.Now()),
5757
FieldsType: "FieldsV1",
58-
FieldsV1: &metav1.FieldsV1{Raw: []byte("fields")},
5958
},
6059
})
6160
u.SetAnnotations(map[string]string{

‎internal/controllers/topology/cluster/reconcile_state_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,10 +501,9 @@ func TestReconcile_callAfterControlPlaneInitialized(t *testing.T) {
501501
{
502502
APIVersion: builder.InfrastructureGroupVersion.String(),
503503
Manager: "manager",
504-
Operation: "op",
504+
Operation: "Apply",
505505
Time: ptr.To(metav1.Now()),
506506
FieldsType: "FieldsV1",
507-
FieldsV1: &metav1.FieldsV1{},
508507
},
509508
})
510509
if tt.cluster.Annotations == nil {
@@ -1145,10 +1144,9 @@ func TestReconcile_callAfterClusterUpgrade(t *testing.T) {
11451144
{
11461145
APIVersion: builder.InfrastructureGroupVersion.String(),
11471146
Manager: "manager",
1148-
Operation: "op",
1147+
Operation: "Apply",
11491148
Time: ptr.To(metav1.Now()),
11501149
FieldsType: "FieldsV1",
1151-
FieldsV1: &metav1.FieldsV1{},
11521150
},
11531151
})
11541152
if tt.s.Current.Cluster.Annotations == nil {

‎internal/util/ssa/managedfields_test.go‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ func TestDropManagedFieldsWithFakeClient(t *testing.T) {
162162
Operation: metav1.ManagedFieldsOperationUpdate,
163163
FieldsType: "FieldsV1",
164164
FieldsV1: &metav1.FieldsV1{Raw: fieldV1},
165+
APIVersion: "v1",
165166
}},
166167
Labels: map[string]string{
167168
"label-1": "value-1",
@@ -186,10 +187,13 @@ func TestDropManagedFieldsWithFakeClient(t *testing.T) {
186187
Operation: metav1.ManagedFieldsOperationUpdate,
187188
FieldsType: "FieldsV1",
188189
FieldsV1: &metav1.FieldsV1{Raw: fieldV1},
190+
APIVersion: "v1",
189191
},
190192
{
191-
Manager: ssaManager,
192-
Operation: metav1.ManagedFieldsOperationApply,
193+
Manager: ssaManager,
194+
Operation: metav1.ManagedFieldsOperationApply,
195+
FieldsType: "FieldsV1",
196+
APIVersion: "v1",
193197
},
194198
},
195199
Labels: map[string]string{
@@ -225,7 +229,7 @@ func TestDropManagedFieldsWithFakeClient(t *testing.T) {
225229
for _, tt := range tests {
226230
t.Run(tt.name, func(t *testing.T) {
227231
g := NewWithT(t)
228-
fakeClient := fake.NewClientBuilder().WithObjects(tt.obj).Build()
232+
fakeClient := fake.NewClientBuilder().WithObjects(tt.obj).WithReturnManagedFields().Build()
229233
labelsAndAnnotationsManagedFieldPaths := []contract.Path{
230234
{"f:metadata", "f:annotations"},
231235
{"f:metadata", "f:labels"},
@@ -414,8 +418,10 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
414418
Name: "cm-1",
415419
Namespace: "default",
416420
ManagedFields: []metav1.ManagedFieldsEntry{{
417-
Manager: classicManager,
418-
Operation: metav1.ManagedFieldsOperationUpdate,
421+
Manager: classicManager,
422+
Operation: metav1.ManagedFieldsOperationUpdate,
423+
FieldsType: "FieldsV1",
424+
APIVersion: "v1",
419425
}},
420426
},
421427
Data: map[string]string{
@@ -427,8 +433,10 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
427433
Name: "cm-1",
428434
Namespace: "default",
429435
ManagedFields: []metav1.ManagedFieldsEntry{{
430-
Manager: ssaManager,
431-
Operation: metav1.ManagedFieldsOperationApply,
436+
Manager: ssaManager,
437+
Operation: metav1.ManagedFieldsOperationApply,
438+
FieldsType: "FieldsV1",
439+
APIVersion: "v1",
432440
}},
433441
},
434442
Data: map[string]string{
@@ -441,12 +449,16 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
441449
Namespace: "default",
442450
ManagedFields: []metav1.ManagedFieldsEntry{
443451
{
444-
Manager: classicManager,
445-
Operation: metav1.ManagedFieldsOperationUpdate,
452+
Manager: classicManager,
453+
Operation: metav1.ManagedFieldsOperationUpdate,
454+
FieldsType: "FieldsV1",
455+
APIVersion: "v1",
446456
},
447457
{
448-
Manager: ssaManager,
449-
Operation: metav1.ManagedFieldsOperationApply,
458+
Manager: ssaManager,
459+
Operation: metav1.ManagedFieldsOperationApply,
460+
FieldsType: "FieldsV1",
461+
APIVersion: "v1",
450462
},
451463
},
452464
},
@@ -485,7 +497,7 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
485497
for _, tt := range tests {
486498
t.Run(tt.name, func(t *testing.T) {
487499
g := NewWithT(t)
488-
fakeClient := fake.NewClientBuilder().WithObjects(tt.obj).Build()
500+
fakeClient := fake.NewClientBuilder().WithObjects(tt.obj).WithReturnManagedFields().Build()
489501
g.Expect(CleanUpManagedFieldsForSSAAdoption(ctx, fakeClient, tt.obj, ssaManager)).Should(Succeed())
490502
g.Expect(tt.obj.GetManagedFields()).Should(
491503
ContainElement(MatchManagedFieldsEntry(ssaManager, metav1.ManagedFieldsOperationApply)))

0 commit comments

Comments
 (0)