@@ -22,13 +22,13 @@ import (
2222
2323 corev1 "k8s.io/api/core/v1"
2424 apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
25- "k8s.io/apimachinery/pkg/api/meta"
2625 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2827 "k8s.io/apimachinery/pkg/types"
2928 "k8s.io/klog/v2"
3029 "k8s.io/utils/ptr"
3130 "sigs.k8s.io/controller-runtime/pkg/client"
31+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
3232 "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3333
3434 addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
@@ -1389,12 +1389,12 @@ func SelectClusterObj(objs []client.Object, namespace, name string) *clusterv1.C
13891389// setUID assigns a UID to the object, so test objects are uniquely identified.
13901390// NB. In order to make debugging easier we are using a human readable, deterministic string (instead of a random UID).
13911391func setUID (obj client.Object ) {
1392- accessor , err := meta . Accessor (obj )
1392+ gvk , err := apiutil . GVKForObject (obj , FakeScheme )
13931393 if err != nil {
1394- panic (fmt .Sprintf ("failed to get accessor for test object: %v" , err ))
1394+ panic (fmt .Sprintf ("failed to get GVK for test object: %v" , err ))
13951395 }
1396- uid := fmt .Sprintf ("%s, %s" , obj . GetObjectKind (). GroupVersionKind (). String (), klog .KObj (accessor ))
1397- accessor .SetUID (types .UID (uid ))
1396+ uid := fmt .Sprintf ("%s, %s" , gvk . String (), klog .KObj (obj ))
1397+ obj .SetUID (types .UID (uid ))
13981398}
13991399
14001400// FakeClusterCustomResourceDefinition returns a fake CRD object for the given group/versions/kind.
0 commit comments