internal/crd/finalizer.go

@@ -27,14 +27,14 @@ func (crd Crd) manageFinalizer(jobEventObservable rxgo.Observable) {
 					// Perform cleanup
 					pkg.Logger.Debug("[finalizer] stopping managed job", zap.String("name", jobEvent.Job.GetName()))
 					if err := crd.cleanupResources(jobEvent.Job); err != nil {
-						pkg.Logger.Info("[crd] [manage-finalizer] cleanup failed", zap.Error(err))
+						pkg.Logger.Error("[crd] [manage-finalizer] cleanup failed", zap.Error(err))
 						return
 					}
 
 					// Remove finalizer
 					controllerutil.RemoveFinalizer(jobEvent.Job, finalizerName)
 					if err := crd.runtimeClient.Update(context.Background(), jobEvent.Job); err != nil {
-						pkg.Logger.Info("[crd] [manage-finalizer] failed to remove finalizer", zap.Error(err))
+						pkg.Logger.Error("[crd] [manage-finalizer] failed to remove finalizer", zap.Error(err))
 						return
 					}
 					pkg.Logger.Debug("[crd] [manage-finalizer] job removed", zap.String("name", jobEvent.Job.GetName()))
@@ -49,7 +49,7 @@ func (crd Crd) manageFinalizer(jobEventObservable rxgo.Observable) {
 				pkg.Logger.Debug("[finalizer] adding job")
 				// Update the resource to add the finalizer
 				if err := crd.runtimeClient.Update(context.Background(), jobEvent.Job); err != nil {
-					pkg.Logger.Info("[finalizer] failed to add", zap.Error(err))
+					pkg.Logger.Error("[finalizer] failed to add", zap.Error(err))
 					return
 				}
 			}

internal/managed_job/manager.go

@@ -50,11 +50,8 @@ func NewManager(client *api.Client, crdInstance *crd.Crd) Manager {
 	go func() {
 		for event := range crd.FinalizerChannel {
 			manager := mgr.GetJob(event)
-			if manager != nil {
+			manager.Stop()
-				err := manager.Stop()
+			delete(mgr.managedJobs, event)
-				pkg.Logger.Info("[finalizer]", zap.Error(err))
-				delete(mgr.managedJobs, event)
-			}
 		}
 	}()
 
@@ -132,7 +129,6 @@ func (mgr *Manager) GetJobs() map[types.UID]ManagedJob {
 	return mgr.managedJobs
 }
 
-func (mgr *Manager) GetJob(id types.UID) *ManagedJob {
+func (mgr *Manager) GetJob(id types.UID) ManagedJob {
-	job := mgr.managedJobs[id]
+	return mgr.managedJobs[id]
-	return &job
 }

internal/managed_job/pause.go

@@ -33,7 +33,7 @@ func (job *ManagedJob) Pause() error {
 		if savepointPath != "" {
 			job.def.Status.LastSavepointPath = &savepointPath
 			job.def.Status.PauseSavepointTriggerId = nil
-			job.def.Status.JobStatus = "FINISHED"
+			job.def.Status.JobStatus = ""
 			job.def.Status.LastSavepointPath = &savepointPath
 			lastSavepointDate := time.Now()
 			job.def.Status.LastSavepointDate = &lastSavepointDate

internal/managed_job/remove.go

@@ -1,11 +1,5 @@
 package managed_job
 
-import "errors"
-
 func (job *ManagedJob) Stop() error {
-	if job.def.Status.JobId != nil {
+	return job.client.StopJob(*job.def.Status.JobId)
-		return job.client.StopJob(*job.def.Status.JobId)
-	} else {
-		return errors.New("job Id not found")
-	}
 }