Merge pull request #9266 from JoelSpeed/schemebuilder-remaining-groups

k8s-ci-robot · web-flow · commit 430d1246423d · 2023-08-23T01:34:21.000-07:00
🌱 Remove reliance on controller-runtime scheme builder for remaining API groups
diff --git a/bootstrap/kubeadm/api/v1beta1/groupversion_info.go b/bootstrap/kubeadm/api/v1beta1/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1beta1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "bootstrap.cluster.x-k8s.io", Version: "v1beta1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go
@@ -193,7 +193,7 @@ type KubeadmConfigList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&KubeadmConfig{}, &KubeadmConfigList{})
+	objectTypes = append(objectTypes, &KubeadmConfig{}, &KubeadmConfigList{})
 }
 
 // Encoding specifies the cloud-init file encoding.
diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_types.go
@@ -60,5 +60,5 @@ type KubeadmConfigTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&KubeadmConfigTemplate{}, &KubeadmConfigTemplateList{})
+	objectTypes = append(objectTypes, &KubeadmConfigTemplate{}, &KubeadmConfigTemplateList{})
 }
diff --git a/cmd/clusterctl/api/v1alpha3/groupversion_info.go b/cmd/clusterctl/api/v1alpha3/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1alpha3
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "clusterctl.cluster.x-k8s.io", Version: "v1alpha3"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/cmd/clusterctl/api/v1alpha3/metadata_type.go b/cmd/clusterctl/api/v1alpha3/metadata_type.go
@@ -54,7 +54,7 @@ func (rs ReleaseSeries) newer(release ReleaseSeries) bool {
 }
 
 func init() {
-	SchemeBuilder.Register(&Metadata{})
+	objectTypes = append(objectTypes, &Metadata{})
 }
 
 // GetReleaseSeriesForVersion returns the release series for a given version.
diff --git a/cmd/clusterctl/api/v1alpha3/provider_type.go b/cmd/clusterctl/api/v1alpha3/provider_type.go
@@ -222,5 +222,5 @@ func (l *ProviderList) filterBy(predicate func(p Provider) bool) []Provider {
 }
 
 func init() {
-	SchemeBuilder.Register(&Provider{}, &ProviderList{})
+	objectTypes = append(objectTypes, &Provider{}, &ProviderList{})
 }
diff --git a/cmd/clusterctl/api/v1alpha3/zz_generated.deepcopy.go b/cmd/clusterctl/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/controlplane/kubeadm/api/v1beta1/groupversion_info.go b/controlplane/kubeadm/api/v1beta1/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1beta1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "controlplane.cluster.x-k8s.io", Version: "v1beta1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_types.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_types.go
@@ -359,5 +359,5 @@ type KubeadmControlPlaneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&KubeadmControlPlane{}, &KubeadmControlPlaneList{})
+	objectTypes = append(objectTypes, &KubeadmControlPlane{}, &KubeadmControlPlaneList{})
 }
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadmcontrolplanetemplate_types.go b/controlplane/kubeadm/api/v1beta1/kubeadmcontrolplanetemplate_types.go
@@ -51,7 +51,7 @@ type KubeadmControlPlaneTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&KubeadmControlPlaneTemplate{}, &KubeadmControlPlaneTemplateList{})
+	objectTypes = append(objectTypes, &KubeadmControlPlaneTemplate{}, &KubeadmControlPlaneTemplateList{})
 }
 
 // KubeadmControlPlaneTemplateResource describes the data needed to create a KubeadmControlPlane from a template.
diff --git a/test/infrastructure/docker/api/v1beta1/dockercluster_types.go b/test/infrastructure/docker/api/v1beta1/dockercluster_types.go
@@ -143,5 +143,5 @@ type DockerClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&DockerCluster{}, &DockerClusterList{})
+	objectTypes = append(objectTypes, &DockerCluster{}, &DockerClusterList{})
 }
diff --git a/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go b/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go
@@ -50,7 +50,7 @@ type DockerClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&DockerClusterTemplate{}, &DockerClusterTemplateList{})
+	objectTypes = append(objectTypes, &DockerClusterTemplate{}, &DockerClusterTemplateList{})
 }
 
 // DockerClusterTemplateResource describes the data needed to create a DockerCluster from a template.
diff --git a/test/infrastructure/docker/api/v1beta1/dockermachine_types.go b/test/infrastructure/docker/api/v1beta1/dockermachine_types.go
@@ -133,5 +133,5 @@ type DockerMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&DockerMachine{}, &DockerMachineList{})
+	objectTypes = append(objectTypes, &DockerMachine{}, &DockerMachineList{})
 }
diff --git a/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go
@@ -50,7 +50,7 @@ type DockerMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&DockerMachineTemplate{}, &DockerMachineTemplateList{})
+	objectTypes = append(objectTypes, &DockerMachineTemplate{}, &DockerMachineTemplateList{})
 }
 
 // DockerMachineTemplateResource describes the data needed to create a DockerMachine from a template.
diff --git a/test/infrastructure/docker/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/api/v1beta1/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1beta1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1beta1/dockermachinepool_types.go
@@ -149,5 +149,5 @@ type DockerMachinePoolList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&DockerMachinePool{}, &DockerMachinePoolList{})
+	objectTypes = append(objectTypes, &DockerMachinePool{}, &DockerMachinePoolList{})
 }
diff --git a/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/exp/api/v1beta1/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1beta1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go b/test/infrastructure/docker/exp/api/v1beta1/zz_generated.deepcopy.go
diff --git a/test/infrastructure/inmemory/api/v1alpha1/groupversion_info.go b/test/infrastructure/inmemory/api/v1alpha1/groupversion_info.go
@@ -20,17 +20,26 @@ limitations under the License.
 package v1alpha1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha1"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemorycluster_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemorycluster_types.go
@@ -95,5 +95,5 @@ type InMemoryClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&InMemoryCluster{}, &InMemoryClusterList{})
+	objectTypes = append(objectTypes, &InMemoryCluster{}, &InMemoryClusterList{})
 }
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemoryclustertemplate_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemoryclustertemplate_types.go
@@ -50,7 +50,7 @@ type InMemoryClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&InMemoryClusterTemplate{}, &InMemoryClusterTemplateList{})
+	objectTypes = append(objectTypes, &InMemoryClusterTemplate{}, &InMemoryClusterTemplateList{})
 }
 
 // InMemoryClusterTemplateResource describes the data needed to create a InMemoryCluster from a template.
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemorymachine_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemorymachine_types.go
@@ -187,5 +187,5 @@ type InMemoryMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&InMemoryMachine{}, &InMemoryMachineList{})
+	objectTypes = append(objectTypes, &InMemoryMachine{}, &InMemoryMachineList{})
 }
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemorymachinetemplate_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemorymachinetemplate_types.go
@@ -50,7 +50,7 @@ type InMemoryMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&InMemoryMachineTemplate{}, &InMemoryMachineTemplateList{})
+	objectTypes = append(objectTypes, &InMemoryMachineTemplate{}, &InMemoryMachineTemplateList{})
 }
 
 // InMemoryMachineTemplateResource describes the data needed to create a InMemoryMachine from a template.

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ type KubeadmConfigList struct {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`func init() {`
`196`		`- SchemeBuilder.Register(&KubeadmConfig{}, &KubeadmConfigList{})`
	`196`	`+ objectTypes = append(objectTypes, &KubeadmConfig{}, &KubeadmConfigList{})`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`// Encoding specifies the cloud-init file encoding.`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ type KubeadmConfigTemplateList struct {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func init() {`
`63`		`- SchemeBuilder.Register(&KubeadmConfigTemplate{}, &KubeadmConfigTemplateList{})`
	`63`	`+ objectTypes = append(objectTypes, &KubeadmConfigTemplate{}, &KubeadmConfigTemplateList{})`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (rs ReleaseSeries) newer(release ReleaseSeries) bool {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func init() {`
`57`		`- SchemeBuilder.Register(&Metadata{})`
	`57`	`+ objectTypes = append(objectTypes, &Metadata{})`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// GetReleaseSeriesForVersion returns the release series for a given version.`
Original file line number	Diff line number	Diff line change
`@@ -222,5 +222,5 @@ func (l *ProviderList) filterBy(predicate func(p Provider) bool) []Provider {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`func init() {`
`225`		`- SchemeBuilder.Register(&Provider{}, &ProviderList{})`
	`225`	`+ objectTypes = append(objectTypes, &Provider{}, &ProviderList{})`
`226`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,5 +359,5 @@ type KubeadmControlPlaneList struct {`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`func init() {`
`362`		`- SchemeBuilder.Register(&KubeadmControlPlane{}, &KubeadmControlPlaneList{})`
	`362`	`+ objectTypes = append(objectTypes, &KubeadmControlPlane{}, &KubeadmControlPlaneList{})`
`363`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ type KubeadmControlPlaneTemplateList struct {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func init() {`
`54`		`- SchemeBuilder.Register(&KubeadmControlPlaneTemplate{}, &KubeadmControlPlaneTemplateList{})`
	`54`	`+ objectTypes = append(objectTypes, &KubeadmControlPlaneTemplate{}, &KubeadmControlPlaneTemplateList{})`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// KubeadmControlPlaneTemplateResource describes the data needed to create a KubeadmControlPlane from a template.`