[ray-operator] Migrate from deprecated scheme.Builder to runtime.NewSchemeBuilder

.golangci.yml

@@ -112,8 +112,6 @@ linters:
       # These require non-trivial migration and should be addressed separately.
       - linters: [staticcheck]
         text: "SA1019:.*GetEventRecorderFor is deprecated"
-      - linters: [staticcheck]
-        text: "SA1019:.*scheme\\.Builder is deprecated"
     generated: strict
     presets:
       - comments

ray-operator/apis/config/v1alpha1/groupversion_info.go

@@ -4,17 +4,26 @@
 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: "config.ray.io", Version: "v1alpha1"}
 
 	// 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
 )
+
+func addKnownTypes(s *runtime.Scheme) error {
+	s.AddKnownTypes(GroupVersion,
+		&Configuration{},
+	)
+	metav1.AddToGroupVersion(s, GroupVersion)
+	return nil
+}

ray-operator/apis/config/v1alpha1/register.go

@@ -5,8 +5,7 @@ import (
 )
 
 func init() {
-	SchemeBuilder.Register(&Configuration{})
-	SchemeBuilder.SchemeBuilder.Register(addDefaultingFuncs)
+	SchemeBuilder.Register(addDefaultingFuncs)
 }
 
 // SchemeGroupVersion is group version used to register these objects.

ray-operator/apis/ray/v1/groupversion_info.go

@@ -4,17 +4,29 @@
 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: "ray.io", 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
 )
+
+func addKnownTypes(s *runtime.Scheme) error {
+	s.AddKnownTypes(GroupVersion,
+		&RayCluster{}, &RayClusterList{},
+		&RayJob{}, &RayJobList{},
+		&RayService{}, &RayServiceList{},
+		&RayCronJob{}, &RayCronJobList{},
+	)
+	metav1.AddToGroupVersion(s, GroupVersion)
+	return nil
+}

ray-operator/apis/ray/v1/raycluster_types.go

@@ -432,10 +432,6 @@ type RayClusterList struct {
 	Items           []RayCluster `json:"items"`
 }
 
-func init() {
-	SchemeBuilder.Register(&RayCluster{}, &RayClusterList{})
-}
-
 type EventReason string
 
 const (

ray-operator/apis/ray/v1/raycronjob_types.go

@@ -50,7 +50,3 @@ type RayCronJobList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RayCronJob `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RayCronJob{}, &RayCronJobList{})
-}

ray-operator/apis/ray/v1/rayjob_types.go

@@ -374,7 +374,3 @@ type RayJobList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RayJob `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RayJob{}, &RayJobList{})
-}

ray-operator/apis/ray/v1/rayservice_types.go

@@ -247,7 +247,3 @@ type RayServiceList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RayService `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RayService{}, &RayServiceList{})
-}

ray-operator/apis/ray/v1alpha1/groupversion_info.go

@@ -4,17 +4,28 @@
 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: "ray.io", Version: "v1alpha1"}
 
 	// 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
 )
+
+func addKnownTypes(s *runtime.Scheme) error {
+	s.AddKnownTypes(GroupVersion,
+		&RayCluster{}, &RayClusterList{},
+		&RayJob{}, &RayJobList{},
+		&RayService{}, &RayServiceList{},
+	)
+	metav1.AddToGroupVersion(s, GroupVersion)
+	return nil
+}

ray-operator/apis/ray/v1alpha1/raycluster_types.go

@@ -202,10 +202,6 @@ type RayClusterList struct {
 	Items           []RayCluster `json:"items"`
 }
 
-func init() {
-	SchemeBuilder.Register(&RayCluster{}, &RayClusterList{})
-}
-
 type EventReason string
 
 const (

ray-operator/apis/ray/v1alpha1/rayjob_types.go

@@ -122,7 +122,3 @@ type RayJobList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RayJob `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RayJob{}, &RayJobList{})
-}

ray-operator/apis/ray/v1alpha1/rayservice_types.go

@@ -120,7 +120,3 @@ type RayServiceList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []RayService `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&RayService{}, &RayServiceList{})
-}