f

Author: emosbaugh

pkg/dryrun/kubeutils.go

@@ -64,10 +64,6 @@ func (k *KubeUtils) IsDaemonsetReady(ctx context.Context, cli client.Client, ns,
 	return true, nil
 }
 
-func (k *KubeUtils) IsJobComplete(ctx context.Context, cli client.Client, ns, name string, completions int32) (bool, error) {
-	return true, nil
-}
-
 func (k *KubeUtils) WaitForKubernetes(ctx context.Context, cli client.Client) <-chan error {
 	errCh := make(chan error)
 	close(errCh)

pkg/kubeutils/interface.go

@@ -33,7 +33,6 @@ type KubeUtilsInterface interface {
 	IsDeploymentReady(ctx context.Context, cli client.Client, ns, name string) (bool, error)
 	IsStatefulSetReady(ctx context.Context, cli client.Client, ns, name string) (bool, error)
 	IsDaemonsetReady(ctx context.Context, cli client.Client, ns, name string) (bool, error)
-	IsJobComplete(ctx context.Context, cli client.Client, ns, name string, completions int32) (bool, error)
 	WaitForKubernetes(ctx context.Context, cli client.Client) <-chan error
 	WaitForCRDToBeReady(ctx context.Context, cli client.Client, name string) error
 	KubeClient() (client.Client, error)
@@ -106,10 +105,6 @@ func IsDaemonsetReady(ctx context.Context, cli client.Client, ns, name string) (
 	return kb.IsDaemonsetReady(ctx, cli, ns, name)
 }
 
-func IsJobComplete(ctx context.Context, cli client.Client, ns, name string, completions int32) (bool, error) {
-	return kb.IsJobComplete(ctx, cli, ns, name, completions)
-}
-
 func WaitForKubernetes(ctx context.Context, cli client.Client) <-chan error {
 	return kb.WaitForKubernetes(ctx, cli)
 }

pkg/kubeutils/kubeutils.go

@@ -118,28 +118,32 @@ func (k *KubeUtils) WaitForJob(ctx context.Context, cli client.Client, ns, name
 	var lasterr error
 	if err := wait.ExponentialBackoffWithContext(
 		ctx, backoff, func(ctx context.Context) (bool, error) {
-			failed, err := k.IsJobFailed(ctx, cli, ns, name)
+			var job batchv1.Job
+			err := cli.Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, &job)
 			if k8serrors.IsNotFound(err) {
 				// exit
 				lasterr = fmt.Errorf("job not found")
 				return false, lasterr
 			} else if err != nil {
-				lasterr = fmt.Errorf("unable to get job status: %w", err)
+				lasterr = fmt.Errorf("unable to get job: %w", err)
 				return false, nil
-			} else if failed {
+			}
+
+			failed := k.isJobFailed(job)
+			if failed {
 				// exit
 				lasterr = fmt.Errorf("job failed")
 				return false, lasterr
 			}
-			ready, err := k.IsJobComplete(ctx, cli, ns, name, completions)
-			if err != nil {
-				lasterr = fmt.Errorf("unable to get job status: %w", err)
-				return false, nil
-			} else if ready {
+
+			completed := k.isJobCompleted(job, completions)
+			if completed {
 				return true, nil
 			}
+
 			// TODO: need to handle the case where the pod get stuck in pending
 			// This can happen if nodes are not schedulable or if a volume is not found
+
 			return false, nil
 		},
 	); err != nil {
@@ -292,35 +296,20 @@ func (k *KubeUtils) IsDaemonsetReady(ctx context.Context, cli client.Client, ns,
 	return false, nil
 }
 
-// IsJobComplete returns true if the job has been completed successfully.
-func (k *KubeUtils) IsJobComplete(ctx context.Context, cli client.Client, ns, name string, completions int32) (bool, error) {
-	var job batchv1.Job
-	nsn := types.NamespacedName{Namespace: ns, Name: name}
-	if err := cli.Get(ctx, nsn, &job); err != nil {
-		return false, err
-	}
-	if job.Status.Succeeded >= completions {
-		return true, nil
-	}
-	return false, nil
+// isJobCompleted returns true if the job has been completed successfully.
+func (k *KubeUtils) isJobCompleted(job batchv1.Job, completions int32) bool {
+	isSucceeded := job.Status.Succeeded >= completions
+	return isSucceeded
 }
 
-// IsJobFailed if the job has exceeded the backoff limit.
-func (k *KubeUtils) IsJobFailed(ctx context.Context, cli client.Client, ns, name string) (bool, error) {
-	var job batchv1.Job
-	nsn := types.NamespacedName{Namespace: ns, Name: name}
-	if err := cli.Get(ctx, nsn, &job); err != nil {
-		return false, err
-	}
+// isJobFailed if the job has exceeded the backoff limit.
+func (k *KubeUtils) isJobFailed(job batchv1.Job) bool {
 	backoffLimit := int32(6) // default
 	if job.Spec.BackoffLimit != nil {
 		backoffLimit = *job.Spec.BackoffLimit
 	}
 	exceedsBackoffLimit := job.Status.Failed > backoffLimit
-	if exceedsBackoffLimit {
-		return true, nil
-	}
-	return false, nil
+	return exceedsBackoffLimit
 }
 
 // IsPodComplete returns true if the pod has completed.