Merge pull request #9185 from JoelSpeed/exp-schemebuilder

k8s-ci-robot · web-flow · commit 7c06531b1781 · 2023-08-15T05:51:21.000-07:00
🌱 Remove reliance on controller-runtime scheme builder for experimental APIs
diff --git a/exp/addons/api/v1beta1/clusterresourceset_types.go b/exp/addons/api/v1beta1/clusterresourceset_types.go
@@ -140,5 +140,5 @@ type ClusterResourceSetList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterResourceSet{}, &ClusterResourceSetList{})
+	objectTypes = append(objectTypes, &ClusterResourceSet{}, &ClusterResourceSetList{})
 }
diff --git a/exp/addons/api/v1beta1/clusterresourcesetbinding_types.go b/exp/addons/api/v1beta1/clusterresourcesetbinding_types.go
@@ -152,5 +152,5 @@ type ClusterResourceSetBindingList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterResourceSetBinding{}, &ClusterResourceSetBindingList{})
+	objectTypes = append(objectTypes, &ClusterResourceSetBinding{}, &ClusterResourceSetBindingList{})
 }
diff --git a/exp/addons/api/v1beta1/groupversion_info.go b/exp/addons/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: "addons.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/exp/api/v1beta1/groupversion_info.go b/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"
+	"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: "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/exp/api/v1beta1/machinepool_types.go b/exp/api/v1beta1/machinepool_types.go
@@ -249,5 +249,5 @@ type MachinePoolList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&MachinePool{}, &MachinePoolList{})
+	objectTypes = append(objectTypes, &MachinePool{}, &MachinePoolList{})
 }
diff --git a/exp/ipam/api/v1alpha1/groupversion_info.go b/exp/ipam/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: "ipam.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/exp/ipam/api/v1alpha1/ipaddress_types.go b/exp/ipam/api/v1alpha1/ipaddress_types.go
@@ -65,5 +65,5 @@ type IPAddressList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IPAddress{}, &IPAddressList{})
+	objectTypes = append(objectTypes, &IPAddress{}, &IPAddressList{})
 }
diff --git a/exp/ipam/api/v1alpha1/ipaddressclaim_types.go b/exp/ipam/api/v1alpha1/ipaddressclaim_types.go
@@ -76,5 +76,5 @@ type IPAddressClaimList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&IPAddressClaim{}, &IPAddressClaimList{})
+	objectTypes = append(objectTypes, &IPAddressClaim{}, &IPAddressClaimList{})
 }
diff --git a/exp/ipam/api/v1alpha1/zz_generated.deepcopy.go b/exp/ipam/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/exp/runtime/api/v1alpha1/extensionconfig_types.go b/exp/runtime/api/v1alpha1/extensionconfig_types.go
@@ -197,7 +197,7 @@ type ExtensionConfigList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ExtensionConfig{}, &ExtensionConfigList{})
+	objectTypes = append(objectTypes, &ExtensionConfig{}, &ExtensionConfigList{})
 }
 
 const (
diff --git a/exp/runtime/api/v1alpha1/groupversion_info.go b/exp/runtime/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: "runtime.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/exp/runtime/api/v1alpha1/zz_generated.deepcopy.go b/exp/runtime/api/v1alpha1/zz_generated.deepcopy.go

Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,5 @@ type ClusterResourceSetList struct {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func init() {`
`143`		`- SchemeBuilder.Register(&ClusterResourceSet{}, &ClusterResourceSetList{})`
	`143`	`+ objectTypes = append(objectTypes, &ClusterResourceSet{}, &ClusterResourceSetList{})`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,5 @@ type ClusterResourceSetBindingList struct {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`func init() {`
`155`		`- SchemeBuilder.Register(&ClusterResourceSetBinding{}, &ClusterResourceSetBindingList{})`
	`155`	`+ objectTypes = append(objectTypes, &ClusterResourceSetBinding{}, &ClusterResourceSetBindingList{})`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,5 +249,5 @@ type MachinePoolList struct {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`func init() {`
`252`		`- SchemeBuilder.Register(&MachinePool{}, &MachinePoolList{})`
	`252`	`+ objectTypes = append(objectTypes, &MachinePool{}, &MachinePoolList{})`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,5 @@ type IPAddressList struct {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func init() {`
`68`		`- SchemeBuilder.Register(&IPAddress{}, &IPAddressList{})`
	`68`	`+ objectTypes = append(objectTypes, &IPAddress{}, &IPAddressList{})`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,5 @@ type IPAddressClaimList struct {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func init() {`
`79`		`- SchemeBuilder.Register(&IPAddressClaim{}, &IPAddressClaimList{})`
	`79`	`+ objectTypes = append(objectTypes, &IPAddressClaim{}, &IPAddressClaimList{})`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ type ExtensionConfigList struct {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`func init() {`
`200`		`- SchemeBuilder.Register(&ExtensionConfig{}, &ExtensionConfigList{})`
	`200`	`+ objectTypes = append(objectTypes, &ExtensionConfig{}, &ExtensionConfigList{})`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`const (`