From f1cbc94add6cc9280d0bad5bf73af2648896e6cf Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Tue, 5 May 2026 20:54:13 +0000 Subject: [PATCH 1/2] [ray-operator] Migrate from deprecated scheme.Builder to runtime.NewSchemeBuilder Signed-off-by: Mark Rossetti --- .golangci.yml | 2 -- .../apis/config/v1alpha1/groupversion_info.go | 13 +++++++++++-- ray-operator/apis/config/v1alpha1/register.go | 3 +-- ray-operator/apis/ray/v1/groupversion_info.go | 16 ++++++++++++++-- ray-operator/apis/ray/v1/raycluster_types.go | 4 ---- ray-operator/apis/ray/v1/raycronjob_types.go | 4 ---- ray-operator/apis/ray/v1/rayjob_types.go | 4 ---- ray-operator/apis/ray/v1/rayservice_types.go | 4 ---- .../apis/ray/v1alpha1/groupversion_info.go | 15 +++++++++++++-- .../apis/ray/v1alpha1/raycluster_types.go | 4 ---- ray-operator/apis/ray/v1alpha1/rayjob_types.go | 4 ---- .../apis/ray/v1alpha1/rayservice_types.go | 4 ---- 12 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 03874c92f27..2c5f17f3d91 100644 --- a/.golangci.yml +++ b/.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 diff --git a/ray-operator/apis/config/v1alpha1/groupversion_info.go b/ray-operator/apis/config/v1alpha1/groupversion_info.go index ea974e7f61c..de9f481ef66 100644 --- a/ray-operator/apis/config/v1alpha1/groupversion_info.go +++ b/ray-operator/apis/config/v1alpha1/groupversion_info.go @@ -4,8 +4,9 @@ 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 ( @@ -13,8 +14,16 @@ var ( 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 +} diff --git a/ray-operator/apis/config/v1alpha1/register.go b/ray-operator/apis/config/v1alpha1/register.go index 58294b6c346..de6e9e8d057 100644 --- a/ray-operator/apis/config/v1alpha1/register.go +++ b/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. diff --git a/ray-operator/apis/ray/v1/groupversion_info.go b/ray-operator/apis/ray/v1/groupversion_info.go index 10eae18132e..c44fdb4fed1 100644 --- a/ray-operator/apis/ray/v1/groupversion_info.go +++ b/ray-operator/apis/ray/v1/groupversion_info.go @@ -4,8 +4,9 @@ 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 ( @@ -13,8 +14,19 @@ var ( 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 +} diff --git a/ray-operator/apis/ray/v1/raycluster_types.go b/ray-operator/apis/ray/v1/raycluster_types.go index c2d759425fa..7abe79cb65b 100644 --- a/ray-operator/apis/ray/v1/raycluster_types.go +++ b/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 ( diff --git a/ray-operator/apis/ray/v1/raycronjob_types.go b/ray-operator/apis/ray/v1/raycronjob_types.go index fbce946d8cb..aa58da7b7fd 100644 --- a/ray-operator/apis/ray/v1/raycronjob_types.go +++ b/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{}) -} diff --git a/ray-operator/apis/ray/v1/rayjob_types.go b/ray-operator/apis/ray/v1/rayjob_types.go index 0cc37f28833..224144b6450 100644 --- a/ray-operator/apis/ray/v1/rayjob_types.go +++ b/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{}) -} diff --git a/ray-operator/apis/ray/v1/rayservice_types.go b/ray-operator/apis/ray/v1/rayservice_types.go index c69b59c2989..98ea52cac5b 100644 --- a/ray-operator/apis/ray/v1/rayservice_types.go +++ b/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{}) -} diff --git a/ray-operator/apis/ray/v1alpha1/groupversion_info.go b/ray-operator/apis/ray/v1alpha1/groupversion_info.go index 426a297a16b..d9f9c80e7bc 100644 --- a/ray-operator/apis/ray/v1alpha1/groupversion_info.go +++ b/ray-operator/apis/ray/v1alpha1/groupversion_info.go @@ -4,8 +4,9 @@ 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 ( @@ -13,8 +14,18 @@ var ( 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 +} diff --git a/ray-operator/apis/ray/v1alpha1/raycluster_types.go b/ray-operator/apis/ray/v1alpha1/raycluster_types.go index 48e6c88c7dc..9dae2cc1a55 100644 --- a/ray-operator/apis/ray/v1alpha1/raycluster_types.go +++ b/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 ( diff --git a/ray-operator/apis/ray/v1alpha1/rayjob_types.go b/ray-operator/apis/ray/v1alpha1/rayjob_types.go index a351fde92c7..22e9e8f274c 100644 --- a/ray-operator/apis/ray/v1alpha1/rayjob_types.go +++ b/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{}) -} diff --git a/ray-operator/apis/ray/v1alpha1/rayservice_types.go b/ray-operator/apis/ray/v1alpha1/rayservice_types.go index ee689b12591..df62a29d881 100644 --- a/ray-operator/apis/ray/v1alpha1/rayservice_types.go +++ b/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{}) -} From b510997ac7e85cf2431793f478c0abb293237da9 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Tue, 5 May 2026 21:10:31 +0000 Subject: [PATCH 2/2] fixup! [ray-operator] Migrate from deprecated scheme.Builder to runtime.NewSchemeBuilder --- ray-operator/apis/ray/v1/zz_generated.deepcopy.go | 2 +- ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ray-operator/apis/ray/v1/zz_generated.deepcopy.go b/ray-operator/apis/ray/v1/zz_generated.deepcopy.go index fcfb31ce811..8c961ed2bb6 100644 --- a/ray-operator/apis/ray/v1/zz_generated.deepcopy.go +++ b/ray-operator/apis/ray/v1/zz_generated.deepcopy.go @@ -7,7 +7,7 @@ package v1 import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go b/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go index 8619f9470b5..fbadc15c433 100644 --- a/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go +++ b/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( "k8s.io/api/core/v1" - runtime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.