add kubebuilder:validation

win5923 · win5923 · commit dcbfe9ad53e8 · 2025-12-06T13:39:06.000Z
Signed-off-by: win5923 &lt;ken89@kimo.com&gt;
diff --git a/ray-operator/apis/ray/v1/raycluster_types.go b/ray-operator/apis/ray/v1/raycluster_types.go
@@ -52,6 +52,7 @@ type RayClusterSpec struct {
 	WorkerGroupSpecs []WorkerGroupSpec `json:"workerGroupSpecs,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=Recreate;None
 type RayClusterUpgradeType string
 
 const (
diff --git a/ray-operator/controllers/ray/utils/validation.go b/ray-operator/controllers/ray/utils/validation.go
@@ -38,7 +38,6 @@ func ValidateRayClusterMetadata(metadata metav1.ObjectMeta) error {
 }
 
 func ValidateRayClusterUpgradeOptions(instance *rayv1.RayCluster) error {
-	// only Recreate and None are valid upgradeType
 	if instance.Spec.UpgradeStrategy != nil && instance.Spec.UpgradeStrategy.Type != nil &&
 		*instance.Spec.UpgradeStrategy.Type != rayv1.Recreate &&
 		*instance.Spec.UpgradeStrategy.Type != rayv1.RayClusterUpgradeNone {

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ type RayClusterSpec struct {`
`52`	`52`	WorkerGroupSpecs []WorkerGroupSpec `json:"workerGroupSpecs,omitempty"`
`53`	`53`	`}`
`54`	`54`
	`55`	`+// +kubebuilder:validation:Enum=Recreate;None`
`55`	`56`	`type RayClusterUpgradeType string`
`56`	`57`
`57`	`58`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ func ValidateRayClusterMetadata(metadata metav1.ObjectMeta) error {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func ValidateRayClusterUpgradeOptions(instance *rayv1.RayCluster) error {`
`41`		`- // only Recreate and None are valid upgradeType`
`42`	`41`	`if instance.Spec.UpgradeStrategy != nil && instance.Spec.UpgradeStrategy.Type != nil &&`
`43`	`42`	`*instance.Spec.UpgradeStrategy.Type != rayv1.Recreate &&`
`44`	`43`	`*instance.Spec.UpgradeStrategy.Type != rayv1.RayClusterUpgradeNone {`