Replace deprecated scheme.Builder with runtime.SchemeBuilder

controller-runtime v0.24.0 deprecated scheme.Builder in favor of
using k8s.io/apimachinery's runtime.SchemeBuilder directly, as API
packages should minimize their dependency footprint.

Author: notandy

api/v1/eviction_types.go

@@ -19,6 +19,7 @@ package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // EvictionSpec defines the desired state of Eviction
@@ -112,5 +113,8 @@ type EvictionList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&Eviction{}, &EvictionList{})
+	SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
+		scheme.AddKnownTypes(GroupVersion, &Eviction{}, &EvictionList{})
+		return nil
+	})
 }

api/v1/groupversion_info.go

@@ -23,20 +23,26 @@ limitations under the License.
 package v1
 
 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: "kvm.cloud.sap", Version: "v1"}
 
 	// 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
 
 	// Workaround: https://github.com/kubernetes-sigs/controller-tools/issues/1193
 	SchemeGroupVersion = GroupVersion
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

api/v1/hypervisor_types.go

@@ -20,6 +20,7 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // ResourceName is the name identifying a hypervisor resource.
@@ -598,5 +599,8 @@ type HypervisorList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&Hypervisor{}, &HypervisorList{})
+	SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
+		scheme.AddKnownTypes(GroupVersion, &Hypervisor{}, &HypervisorList{})
+		return nil
+	})
 }

api/v1/zz_generated.deepcopy.go

@@ -146,7 +146,7 @@ spec:
                   (as used by PodSpec.volumes in core Kubernetes): exactly one
                   type-specific sub-field must be populated per entry.
 
-                  The Cortex Placement Shim and scheduler read group memberships
+                  The Cortex Placement shim and scheduler read group memberships
                   directly from this field.
 
                   Note: uniqueness of trait names and aggregate UUIDs is not enforced