Skip to content

Commit

Permalink
managed fields bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuvaraj Kakaraparthi committed Feb 19, 2023
1 parent f3a15df commit 87293fe
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion internal/util/ssa/managedfields.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package ssa
import (
"context"
"encoding/json"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"

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

0 comments on commit 87293fe

Please sign in to comment.