Use apimachinery runtime to register API scheme

To remove controller-runtime from our API package we replace its "scheme" package with apimachinery's runtime.
kubernetes-sigs · Sep 28, 2023 · 6f0d541 · 6f0d541
1 parent 9398981
commit 6f0d541
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/api/v1alpha2/addonprovider_types.go b/api/v1alpha2/addonprovider_types.go
@@ -53,7 +53,3 @@ type AddonProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AddonProvider `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&AddonProvider{}, &AddonProviderList{})
-}
diff --git a/api/v1alpha2/bootstrapprovider_types.go b/api/v1alpha2/bootstrapprovider_types.go
@@ -53,7 +53,3 @@ type BootstrapProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []BootstrapProvider `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&BootstrapProvider{}, &BootstrapProviderList{})
-}
diff --git a/api/v1alpha2/controlplaneprovider_types.go b/api/v1alpha2/controlplaneprovider_types.go
@@ -53,7 +53,3 @@ type ControlPlaneProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ControlPlaneProvider `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ControlPlaneProvider{}, &ControlPlaneProviderList{})
-}
diff --git a/api/v1alpha2/coreprovider_types.go b/api/v1alpha2/coreprovider_types.go
@@ -53,7 +53,3 @@ type CoreProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []CoreProvider `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&CoreProvider{}, &CoreProviderList{})
-}
diff --git a/api/v1alpha2/groupversion_info.go b/api/v1alpha2/groupversion_info.go
@@ -20,17 +20,33 @@ limitations under the License.
 package v1alpha2
 
 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: "operator.cluster.x-k8s.io", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+// Adds the list of known types to api.Scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&CoreProvider{}, &CoreProviderList{},
+		&BootstrapProvider{}, &BootstrapProviderList{},
+		&ControlPlaneProvider{}, &ControlPlaneProviderList{},
+		&InfrastructureProvider{}, &InfrastructureProviderList{},
+		&AddonProvider{}, &AddonProviderList{},
+	)
+
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+
+	return nil
+}
diff --git a/api/v1alpha2/infrastructureprovider_types.go b/api/v1alpha2/infrastructureprovider_types.go
@@ -53,7 +53,3 @@ type InfrastructureProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []InfrastructureProvider `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&InfrastructureProvider{}, &InfrastructureProviderList{})
-}