@@ -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" },
@@ -416,6 +420,8 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
416420 ManagedFields : []metav1.ManagedFieldsEntry {{
417421 Manager : classicManager ,
418422 Operation : metav1 .ManagedFieldsOperationUpdate ,
423+ FieldsType : "FieldsV1" ,
424+ APIVersion : "v1" ,
419425 }},
420426 },
421427 Data : map [string ]string {
@@ -429,6 +435,8 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
429435 ManagedFields : []metav1.ManagedFieldsEntry {{
430436 Manager : ssaManager ,
431437 Operation : metav1 .ManagedFieldsOperationApply ,
438+ FieldsType : "FieldsV1" ,
439+ APIVersion : "v1" ,
432440 }},
433441 },
434442 Data : map [string ]string {
@@ -443,10 +451,14 @@ func TestCleanUpManagedFieldsForSSAAdoptionWithFakeClient(t *testing.T) {
443451 {
444452 Manager : classicManager ,
445453 Operation : metav1 .ManagedFieldsOperationUpdate ,
454+ FieldsType : "FieldsV1" ,
455+ APIVersion : "v1" ,
446456 },
447457 {
448458 Manager : ssaManager ,
449459 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