Fix self.suspend

andreyvelich · andreyvelich · commit 32b1dc7cdf4f · 2026-02-03T02:30:55.000Z
Signed-off-by: Andrey Velichkevich &lt;andrey.velichkevich@gmail.com&gt;
diff --git a/charts/kubeflow-trainer/crds/trainer.kubeflow.org_trainjobs.yaml b/charts/kubeflow-trainer/crds/trainer.kubeflow.org_trainjobs.yaml
@@ -4913,7 +4913,7 @@ spec:
             type: object
             x-kubernetes-validations:
             - message: podTemplateOverrides are immutable when suspend is false
-              rule: (has(oldSelf.suspend) && oldSelf.suspend) || self.podTemplateOverrides
+              rule: (has(self.suspend) && self.suspend) || self.podTemplateOverrides
                 == oldSelf.podTemplateOverrides
           status:
             description: status of TrainJob.
diff --git a/manifests/base/crds/trainer.kubeflow.org_trainjobs.yaml b/manifests/base/crds/trainer.kubeflow.org_trainjobs.yaml
@@ -4913,7 +4913,7 @@ spec:
             type: object
             x-kubernetes-validations:
             - message: podTemplateOverrides are immutable when suspend is false
-              rule: (has(oldSelf.suspend) && oldSelf.suspend) || self.podTemplateOverrides
+              rule: (has(self.suspend) && self.suspend) || self.podTemplateOverrides
                 == oldSelf.podTemplateOverrides
           status:
             description: status of TrainJob.
diff --git a/pkg/apis/trainer/v1alpha1/trainjob_types.go b/pkg/apis/trainer/v1alpha1/trainjob_types.go
@@ -95,7 +95,7 @@ type TrainJobList struct {
 }
 
 // TrainJobSpec represents specification of the desired TrainJob.
-// +kubebuilder:validation:XValidation:rule="(has(oldSelf.suspend) && oldSelf.suspend) || self.podTemplateOverrides == oldSelf.podTemplateOverrides", message="podTemplateOverrides are immutable when suspend is false"
+// +kubebuilder:validation:XValidation:rule="(has(self.suspend) && self.suspend) || self.podTemplateOverrides == oldSelf.podTemplateOverrides", message="podTemplateOverrides are immutable when suspend is false"
 type TrainJobSpec struct {
 	// runtimeRef is the reference to the training runtime.
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="field is immutable"
diff --git a/test/integration/controller/controller.test b/test/integration/controller/controller.test
diff --git a/test/integration/webhooks/trainjob_test.go b/test/integration/webhooks/trainjob_test.go
@@ -497,7 +497,7 @@ var _ = ginkgo.Describe("TrainJob marker validations and defaulting", ginkgo.Ord
 					return job
 				},
 				testingutil.BeInvalidError()),
-			ginkgo.Entry("Should success to update podTemplateOverride when suspend is true",
+			ginkgo.Entry("Should succeed to update podTemplateOverride when suspend is true",
 				func() *trainer.TrainJob {
 					return testingutil.MakeTrainJobWrapper(ns.Name, "valid-trainer").
 						RuntimeRef(trainer.SchemeGroupVersion.WithKind(trainer.TrainingRuntimeKind), "testing").
diff --git a/test/integration/webhooks/webhooks.test b/test/integration/webhooks/webhooks.test

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ type TrainJobList struct {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// TrainJobSpec represents specification of the desired TrainJob.`
`98`		`-// +kubebuilder:validation:XValidation:rule="(has(oldSelf.suspend) && oldSelf.suspend) \|\| self.podTemplateOverrides == oldSelf.podTemplateOverrides", message="podTemplateOverrides are immutable when suspend is false"`
	`98`	`+// +kubebuilder:validation:XValidation:rule="(has(self.suspend) && self.suspend) \|\| self.podTemplateOverrides == oldSelf.podTemplateOverrides", message="podTemplateOverrides are immutable when suspend is false"`
`99`	`99`	`type TrainJobSpec struct {`
`100`	`100`	`// runtimeRef is the reference to the training runtime.`
`101`	`101`	`// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="field is immutable"`