Merge pull request #1797 from kranurag7/kr/change-how-we-register-scheme

🌱 change how we register scheme as per capi 1.6

Author: k8s-ci-robot

api/v1alpha8/groupversion_info.go

@@ -20,17 +20,26 @@ limitations under the License.
 package v1alpha8
 
 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: "v1alpha8"}
 
-	// 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
+}

api/v1alpha8/openstackcluster_types.go

@@ -265,5 +265,5 @@ type OpenStackClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&OpenStackCluster{}, &OpenStackClusterList{})
+	objectTypes = append(objectTypes, &OpenStackCluster{}, &OpenStackClusterList{})
 }

api/v1alpha8/openstackclustertemplate_types.go

@@ -52,5 +52,5 @@ type OpenStackClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&OpenStackClusterTemplate{}, &OpenStackClusterTemplateList{})
+	objectTypes = append(objectTypes, &OpenStackClusterTemplate{}, &OpenStackClusterTemplateList{})
 }

api/v1alpha8/openstackmachine_types.go

@@ -185,5 +185,5 @@ func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, f
 }
 
 func init() {
-	SchemeBuilder.Register(&OpenStackMachine{}, &OpenStackMachineList{})
+	objectTypes = append(objectTypes, &OpenStackMachine{}, &OpenStackMachineList{})
 }

api/v1alpha8/openstackmachinetemplate_types.go

@@ -47,5 +47,5 @@ type OpenStackMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&OpenStackMachineTemplate{}, &OpenStackMachineTemplateList{})
+	objectTypes = append(objectTypes, &OpenStackMachineTemplate{}, &OpenStackMachineTemplateList{})
 }