Skip to content

Commit 87293fe

Browse files
author
Yuvaraj Kakaraparthi
committed
managed fields bug fix
1 parent f3a15df commit 87293fe

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

internal/util/ssa/managedfields.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ package ssa
2020
import (
2121
"context"
2222
"encoding/json"
23+
"k8s.io/klog/v2"
24+
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
2325

2426
"github.com/pkg/errors"
2527
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -81,10 +83,14 @@ func CleanUpManagedFieldsForSSAAdoption(ctx context.Context, obj client.Object,
8183
return errors.Wrap(err, "failed to create seeding fieldV1Map for cleaning up legacy managed fields")
8284
}
8385
now := metav1.Now()
86+
gvk, err := apiutil.GVKForObject(obj, c.Scheme())
87+
if err != nil {
88+
return errors.Wrapf(err, "failed to get GroupVersionKind of object %s", klog.KObj(obj))
89+
}
8490
managedFields = append(managedFields, metav1.ManagedFieldsEntry{
8591
Manager: ssaManager,
8692
Operation: metav1.ManagedFieldsOperationApply,
87-
APIVersion: obj.GetObjectKind().GroupVersionKind().GroupVersion().String(),
93+
APIVersion: gvk.GroupVersion().String(),
8894
Time: &now,
8995
FieldsType: "FieldsV1",
9096
FieldsV1: &metav1.FieldsV1{Raw: fieldV1},

0 commit comments

Comments
 (0)