final nit comments addressed and changed Eviction constant to be Work…

…loadEvictedByDeactivation
kubernetes-sigs · Nov 30, 2023 · 10b35fb · 10b35fb
1 parent af747a6
commit 10b35fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/apis/kueue/v1beta1/workload_types.go b/apis/kueue/v1beta1/workload_types.go
@@ -281,7 +281,7 @@ const (
 
 	// WorkloadEvictedByAcitveField indicates that the workload was evicted
 	// because spec.active is set to false.
-	WorkloadEvictedByAcitveField = "WorkloadIsNotActive"
+	WorkloadEvictedByDeactivation = "InactiveWorkload"
 )
 
 // +genclient

diff --git a/pkg/controller/jobframework/reconciler.go b/pkg/controller/jobframework/reconciler.go
@@ -365,7 +365,7 @@ func (r *JobReconciler) ReconcileGenericJob(ctx context.Context, req ctrl.Reques
 
 	// 8. handle workload is deactivated.
 	if !ptr.Deref(wl.Spec.Active, true) {
-		workload.SetEvictedCondition(wl, kueue.WorkloadEvictedByAcitveField, "The workload is deactivated")
+		workload.SetEvictedCondition(wl, kueue.WorkloadEvictedByDeactivation, "The workload is deactivated")
 		err := workload.ApplyAdmissionStatus(ctx, r.client, wl, true)
 		if err != nil {
 			return ctrl.Result{}, fmt.Errorf("setting eviction: %w", err)

diff --git a/pkg/controller/jobs/job/job_controller_test.go b/pkg/controller/jobs/job/job_controller_test.go
@@ -484,7 +484,7 @@ func TestReconciler(t *testing.T) {
 					Condition(metav1.Condition{
 						Type:    kueue.WorkloadEvicted,
 						Status:  metav1.ConditionTrue,
-						Reason:  "WorkloadIsNotActive",
+						Reason:  "InactiveWorkload",
 						Message: "The workload is deactivated",
 					}).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -515,7 +515,7 @@ func TestReconciler(t *testing.T) {
 					Condition(metav1.Condition{
 						Type:    kueue.WorkloadEvicted,
 						Status:  metav1.ConditionTrue,
-						Reason:  "WorkloadIsNotActive",
+						Reason:  "InactiveWorkload",
 						Message: "The workload is deactivated",
 					}).
 					AdmissionCheck(kueue.AdmissionCheckState{
@@ -554,7 +554,7 @@ func TestReconciler(t *testing.T) {
 					Condition(metav1.Condition{
 						Type:    kueue.WorkloadEvicted,
 						Status:  metav1.ConditionTrue,
-						Reason:  "WorkloadIsNotActive",
+						Reason:  "InactiveWorkload",
 						Message: "The workload is deactivated",
 					}).
 					AdmissionCheck(kueue.AdmissionCheckState{

diff --git a/test/integration/controller/jobs/job/job_controller_test.go b/test/integration/controller/jobs/job/job_controller_test.go
@@ -62,6 +62,7 @@ var (
 // +kubebuilder:docs-gen:collapse=Imports
 
 var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
+
 	ginkgo.BeforeAll(func() {
 		fwk = &framework.Framework{
 			CRDPath: crdPath,