Merge pull request #56 from shopware/fix-migration-job

fix: migration was checking for wrong container
shopware · Oct 16, 2024 · e6dda55 · e6dda55
2 parents a9f3648 + d2d1703
commit e6dda55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/controller/status.go b/internal/controller/status.go
@@ -289,7 +289,7 @@ func (r *StoreReconciler) stateMigration(ctx context.Context, store *v1.Store) v
 		return v1.StateMigration
 	}
 
-	jobState, err := job.IsJobContainerDone(ctx, r.Client, migration, job.MigrateJobName(store))
+	jobState, err := job.IsJobContainerDone(ctx, r.Client, migration, job.CONTAINER_NAME_MIGRATION_JOB)
 	if err != nil {
 		con.Reason = err.Error()
 		con.Status = Error

diff --git a/internal/job/util.go b/internal/job/util.go
@@ -85,8 +85,8 @@ func IsJobContainerDone(
 		}
 	}
 
-	err := fmt.Errorf("job not found in container")
-	log.FromContext(ctx).Error(err, "job not found in container")
+	err := fmt.Errorf("job not found in container: %s", containerName)
+	log.FromContext(ctx).Error(err, err.Error())
 	return JobState{}, err
 }