Improve API package dependencies on controller-runtime

kubernetes-sigs · Aug 16, 2023 · a9541fc · a9541fc
1 parent 1a94554
commit a9541fc
Show file tree

Hide file tree

Showing 33 changed files with 87 additions and 47 deletions.
diff --git a/apis/v1alpha3/groupversion_info.go b/apis/v1alpha3/groupversion_info.go
@@ -17,8 +17,9 @@ limitations under the License.
 package v1alpha3
 
 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"
 )
 
 const (
@@ -33,12 +34,21 @@ var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: GroupName, Version: Version}
 
-	// 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 contains all types to be registered to the GroupVersion.
+	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = schemeBuilder
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/apis/v1alpha3/haproxyloadbalancer_types.go b/apis/v1alpha3/haproxyloadbalancer_types.go
@@ -89,5 +89,5 @@ type HAProxyLoadBalancerList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&HAProxyLoadBalancer{}, &HAProxyLoadBalancerList{})
+	objectTypes = append(objectTypes, &HAProxyLoadBalancer{}, &HAProxyLoadBalancerList{})
 }
diff --git a/apis/v1alpha3/vspherecluster_types.go b/apis/v1alpha3/vspherecluster_types.go
@@ -123,5 +123,5 @@ type VSphereClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereCluster{}, &VSphereClusterList{})
+	objectTypes = append(objectTypes, &VSphereCluster{}, &VSphereClusterList{})
 }
diff --git a/apis/v1alpha3/vsphereclusteridentity_types.go b/apis/v1alpha3/vsphereclusteridentity_types.go
@@ -105,5 +105,5 @@ type VSphereClusterIdentityList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
+	objectTypes = append(objectTypes, &VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
 }
diff --git a/apis/v1alpha3/vspheredeploymentzone_types.go b/apis/v1alpha3/vspheredeploymentzone_types.go
@@ -105,5 +105,5 @@ type VSphereDeploymentZoneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
+	objectTypes = append(objectTypes, &VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
 }
diff --git a/apis/v1alpha3/vspherefailuredomain_types.go b/apis/v1alpha3/vspherefailuredomain_types.go
@@ -114,5 +114,5 @@ type VSphereFailureDomainList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereFailureDomain{}, &VSphereFailureDomainList{})
+	objectTypes = append(objectTypes, &VSphereFailureDomain{}, &VSphereFailureDomainList{})
 }
diff --git a/apis/v1alpha3/vspheremachine_types.go b/apis/v1alpha3/vspheremachine_types.go
@@ -142,5 +142,5 @@ type VSphereMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachine{}, &VSphereMachineList{})
+	objectTypes = append(objectTypes, &VSphereMachine{}, &VSphereMachineList{})
 }
diff --git a/apis/v1alpha3/vspheremachinetemplate_types.go b/apis/v1alpha3/vspheremachinetemplate_types.go
@@ -52,5 +52,5 @@ type VSphereMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
+	objectTypes = append(objectTypes, &VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
 }
diff --git a/apis/v1alpha3/vspherevm_types.go b/apis/v1alpha3/vspherevm_types.go
@@ -161,5 +161,5 @@ type VSphereVMList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereVM{}, &VSphereVMList{})
+	objectTypes = append(objectTypes, &VSphereVM{}, &VSphereVMList{})
 }
diff --git a/apis/v1alpha4/groupversion_info.go b/apis/v1alpha4/groupversion_info.go
@@ -17,8 +17,9 @@ limitations under the License.
 package v1alpha4
 
 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"
 )
 
 const (
@@ -33,12 +34,21 @@ var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: GroupName, Version: Version}
 
-	// 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 contains all types to be registered to the GroupVersion.
+	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = schemeBuilder
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/apis/v1alpha4/vspherecluster_types.go b/apis/v1alpha4/vspherecluster_types.go
@@ -101,5 +101,5 @@ type VSphereClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereCluster{}, &VSphereClusterList{})
+	objectTypes = append(objectTypes, &VSphereCluster{}, &VSphereClusterList{})
 }
diff --git a/apis/v1alpha4/vsphereclusteridentity_types.go b/apis/v1alpha4/vsphereclusteridentity_types.go
@@ -105,5 +105,5 @@ type VSphereClusterIdentityList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
+	objectTypes = append(objectTypes, &VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
 }
diff --git a/apis/v1alpha4/vsphereclustertemplate_types.go b/apis/v1alpha4/vsphereclustertemplate_types.go
@@ -52,7 +52,7 @@ type VSphereClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
+	objectTypes = append(objectTypes, &VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
 }
 
 type VSphereClusterTemplateResource struct {

diff --git a/apis/v1alpha4/vspheredeploymentzone_types.go b/apis/v1alpha4/vspheredeploymentzone_types.go
@@ -113,5 +113,5 @@ type VSphereDeploymentZoneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
+	objectTypes = append(objectTypes, &VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
 }
diff --git a/apis/v1alpha4/vspherefailuredomain_types.go b/apis/v1alpha4/vspherefailuredomain_types.go
@@ -115,5 +115,5 @@ type VSphereFailureDomainList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereFailureDomain{}, &VSphereFailureDomainList{})
+	objectTypes = append(objectTypes, &VSphereFailureDomain{}, &VSphereFailureDomainList{})
 }
diff --git a/apis/v1alpha4/vspheremachine_types.go b/apis/v1alpha4/vspheremachine_types.go
@@ -142,5 +142,5 @@ type VSphereMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachine{}, &VSphereMachineList{})
+	objectTypes = append(objectTypes, &VSphereMachine{}, &VSphereMachineList{})
 }
diff --git a/apis/v1alpha4/vspheremachinetemplate_types.go b/apis/v1alpha4/vspheremachinetemplate_types.go
@@ -52,5 +52,5 @@ type VSphereMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
+	objectTypes = append(objectTypes, &VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
 }
diff --git a/apis/v1alpha4/vspherevm_types.go b/apis/v1alpha4/vspherevm_types.go
@@ -161,5 +161,5 @@ type VSphereVMList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereVM{}, &VSphereVMList{})
+	objectTypes = append(objectTypes, &VSphereVM{}, &VSphereVMList{})
 }
diff --git a/apis/v1beta1/groupversion_info.go b/apis/v1beta1/groupversion_info.go
@@ -17,8 +17,9 @@ 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"
 )
 
 const (
@@ -33,9 +34,18 @@ var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: GroupName, Version: Version}
 
-	// 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 contains all types to be registered to the GroupVersion.
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/apis/v1beta1/vspherecluster_types.go b/apis/v1beta1/vspherecluster_types.go
@@ -134,5 +134,5 @@ type VSphereClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereCluster{}, &VSphereClusterList{})
+	objectTypes = append(objectTypes, &VSphereCluster{}, &VSphereClusterList{})
 }
diff --git a/apis/v1beta1/vsphereclusteridentity_types.go b/apis/v1beta1/vsphereclusteridentity_types.go
@@ -101,5 +101,5 @@ type VSphereClusterIdentityList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
+	objectTypes = append(objectTypes, &VSphereClusterIdentity{}, &VSphereClusterIdentityList{})
 }
diff --git a/apis/v1beta1/vsphereclustertemplate_types.go b/apis/v1beta1/vsphereclustertemplate_types.go
@@ -48,7 +48,7 @@ type VSphereClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
+	objectTypes = append(objectTypes, &VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
 }
 
 type VSphereClusterTemplateResource struct {

diff --git a/apis/v1beta1/vspheredeploymentzone_types.go b/apis/v1beta1/vspheredeploymentzone_types.go
@@ -116,5 +116,5 @@ type VSphereDeploymentZoneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
+	objectTypes = append(objectTypes, &VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
 }
diff --git a/apis/v1beta1/vspherefailuredomain_types.go b/apis/v1beta1/vspherefailuredomain_types.go
@@ -112,5 +112,5 @@ type VSphereFailureDomainList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereFailureDomain{}, &VSphereFailureDomainList{})
+	objectTypes = append(objectTypes, &VSphereFailureDomain{}, &VSphereFailureDomainList{})
 }
diff --git a/apis/v1beta1/vspheremachine_types.go b/apis/v1beta1/vspheremachine_types.go
@@ -165,5 +165,5 @@ type VSphereMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachine{}, &VSphereMachineList{})
+	objectTypes = append(objectTypes, &VSphereMachine{}, &VSphereMachineList{})
 }
diff --git a/apis/v1beta1/vspheremachinetemplate_types.go b/apis/v1beta1/vspheremachinetemplate_types.go
@@ -48,5 +48,5 @@ type VSphereMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
+	objectTypes = append(objectTypes, &VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
 }
diff --git a/apis/v1beta1/vspherevm_types.go b/apis/v1beta1/vspherevm_types.go
@@ -213,5 +213,5 @@ type VSphereVMList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereVM{}, &VSphereVMList{})
+	objectTypes = append(objectTypes, &VSphereVM{}, &VSphereVMList{})
 }
diff --git a/apis/vmware/v1beta1/groupversion_info.go b/apis/vmware/v1beta1/groupversion_info.go
@@ -17,8 +17,9 @@ 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"
 )
 
 const (
@@ -33,9 +34,18 @@ var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: GroupName, Version: Version}
 
-	// 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 contains all types to be registered to the GroupVersion.
+	objectTypes = []runtime.Object{}
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/apis/vmware/v1beta1/providerserviceaccount_types.go b/apis/vmware/v1beta1/providerserviceaccount_types.go
@@ -73,5 +73,5 @@ type ProviderServiceAccountList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&ProviderServiceAccount{}, &ProviderServiceAccountList{})
+	objectTypes = append(objectTypes, &ProviderServiceAccount{}, &ProviderServiceAccountList{})
 }
diff --git a/apis/vmware/v1beta1/vspherecluster_types.go b/apis/vmware/v1beta1/vspherecluster_types.go
@@ -87,5 +87,5 @@ func (r *VSphereCluster) SetConditions(conditions clusterv1.Conditions) {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereCluster{}, &VSphereClusterList{})
+	objectTypes = append(objectTypes, &VSphereCluster{}, &VSphereClusterList{})
 }
diff --git a/apis/vmware/v1beta1/vsphereclustertemplate_types.go b/apis/vmware/v1beta1/vsphereclustertemplate_types.go
@@ -48,7 +48,7 @@ type VSphereClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
+	objectTypes = append(objectTypes, &VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
 }
 
 type VSphereClusterTemplateResource struct {

diff --git a/apis/vmware/v1beta1/vspheremachine_types.go b/apis/vmware/v1beta1/vspheremachine_types.go
@@ -182,5 +182,5 @@ func (r *VSphereMachine) SetConditions(conditions clusterv1.Conditions) {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachine{}, &VSphereMachineList{})
+	objectTypes = append(objectTypes, &VSphereMachine{}, &VSphereMachineList{})
 }
diff --git a/apis/vmware/v1beta1/vspheremachinetemplate_types.go b/apis/vmware/v1beta1/vspheremachinetemplate_types.go
@@ -48,5 +48,5 @@ type VSphereMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
+	objectTypes = append(objectTypes, &VSphereMachineTemplate{}, &VSphereMachineTemplateList{})
 }