bug fix in MinAvailable usage: 0 should be interpreted as 1

dgrove-oss · dgrove-oss · commit 642fe6962a32 · 2024-05-03T14:59:48.000-04:00
diff --git a/internal/controller/resource_manager.go b/internal/controller/resource_manager.go
@@ -178,8 +178,12 @@ func (r *AppWrapperReconciler) isSuccessful(ctx context.Context, appWrapper *mca
 			}
 		}
 	}
-	// To succeed we need to pass the custom completionstatus check or have enough successful pods if MinAvailable > 0
-	return custom || appWrapper.Spec.Scheduling.MinAvailable > 0 && counts.Succeeded >= int(appWrapper.Spec.Scheduling.MinAvailable), nil
+	// To succeed we need to pass the custom completionstatus check or have enough successful pods if MinAvailable >= 0
+	targetSucceeded := int32(1)
+	if appWrapper.Spec.Scheduling.MinAvailable > targetSucceeded {
+		targetSucceeded = appWrapper.Spec.Scheduling.MinAvailable
+	}
+	return custom || appWrapper.Spec.Scheduling.MinAvailable >= 0 && counts.Succeeded >= int(targetSucceeded), nil
 }
 
 // Delete wrapped resources, forcing deletion of pods and wrapped resources if enabled

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,12 @@ func (r AppWrapperReconciler) isSuccessful(ctx context.Context, appWrapper mca`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`
`181`		`- // To succeed we need to pass the custom completionstatus check or have enough successful pods if MinAvailable > 0`
`182`		`- return custom \|\| appWrapper.Spec.Scheduling.MinAvailable > 0 && counts.Succeeded >= int(appWrapper.Spec.Scheduling.MinAvailable), nil`
	`181`	`+ // To succeed we need to pass the custom completionstatus check or have enough successful pods if MinAvailable >= 0`
	`182`	`+ targetSucceeded := int32(1)`
	`183`	`+ if appWrapper.Spec.Scheduling.MinAvailable > targetSucceeded {`
	`184`	`+ targetSucceeded = appWrapper.Spec.Scheduling.MinAvailable`
	`185`	`+ }`
	`186`	`+ return custom \|\| appWrapper.Spec.Scheduling.MinAvailable >= 0 && counts.Succeeded >= int(targetSucceeded), nil`
`183`	`187`	`}`
`184`	`188`
`185`	`189`	`// Delete wrapped resources, forcing deletion of pods and wrapped resources if enabled`