Revert some of the clusterctl changes

Author: sbueringer

cmd/clusterctl/client/cluster/upgrader_info_test.go

@@ -491,6 +491,10 @@ func toSemanticVersions(versions []string) []version.Version {
 
 func fakeProvider(name string, providerType clusterctlv1.ProviderType, version, targetNamespace string) clusterctlv1.Provider {
 	return clusterctlv1.Provider{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: clusterctlv1.GroupVersion.String(),
+			Kind:       "Provider",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			ResourceVersion: "999",
 			Namespace:       targetNamespace,

cmd/clusterctl/client/upgrade_test.go

@@ -365,6 +365,10 @@ func fakeClientForUpgrade() *fakeClient {
 
 func fakeProvider(name string, providerType clusterctlv1.ProviderType, version, targetNamespace string) clusterctlv1.Provider {
 	return clusterctlv1.Provider{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: clusterctlv1.GroupVersion.String(),
+			Kind:       "Provider",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: targetNamespace,
 			Name:      clusterctlv1.ManifestLabel(name, providerType),

cmd/clusterctl/internal/test/fake_objects.go

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