Merge pull request #34 from shopware/fix-container-name-matching

fix: container name matching

.goreleaser.yaml

@@ -13,6 +13,7 @@ before:
     - go mod tidy
     - make generate
     - make manifests
+    - make licenses path=.
 
 builds:
   - id: manager
@@ -30,7 +31,9 @@ dockers:
   - id: operator-amd64
     goarch: amd64
     use: buildx
-
+    extra_files:
+      - "LICENSE"
+      - "third-party-licenses.md"
     goamd64: v3
     dockerfile: build/Dockerfile
     image_templates:
@@ -43,6 +46,9 @@ dockers:
   - id: operator-arm64
     goarch: arm64
     use: buildx
+    extra_files:
+      - "LICENSE"
+      - "third-party-licenses.md"
     goamd64: v3
     dockerfile: build/Dockerfile
     image_templates:

Makefile

@@ -67,8 +67,8 @@ help: ## Display this help.
 licenses: path go-licenses
 	mkdir -p $(path)
 	@cd cmd; \
-	$(GOLICENSES) report . --template ../build/licenses.tpl > ../third-party-licenses.md
-	mv third-party-licenses.md $(path)
+	$(GOLICENSES) report . --template ../build/licenses.tpl > ../tpl.md
+	mv tpl.md $(path)/third-party-licenses.md
 
 ##@ Development
 

internal/controller/status.go

@@ -229,7 +229,7 @@ func (r *StoreReconciler) stateSetup(ctx context.Context, store *v1.Store) v1.St
 		return v1.StateSetup
 	}
 
-	done, err := job.IsJobContainerDone(ctx, r.Client, setup)
+	done, err := job.IsJobContainerDone(ctx, r.Client, setup, job.CONTAINER_NAME_SETUP_JOB)
 	if err != nil {
 		con.Reason = err.Error()
 		con.Status = Error
@@ -281,7 +281,7 @@ func (r *StoreReconciler) stateMigration(ctx context.Context, store *v1.Store) v
 		return v1.StateMigration
 	}
 
-	done, err := job.IsJobContainerDone(ctx, r.Client, migration)
+	done, err := job.IsJobContainerDone(ctx, r.Client, migration, job.MigrateJobName(store))
 	if err != nil {
 		con.Reason = err.Error()
 		con.Status = Error
@@ -369,6 +369,7 @@ func (r *StoreReconciler) stateReady(ctx context.Context, store *v1.Store) v1.St
 		}
 		con.Status = Error
 		con.Reason = fmt.Sprintf("get deployment: %s", err.Error())
+		return v1.StateReady
 	}
 
 	if currentImage == store.Spec.Container.Image {

internal/deployment/storefront.go

@@ -15,6 +15,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const DEPLOYMENT_STOREFRONT_CONTAINER_NAME = "shopware-storefront"
+
 func GetStorefrontDeployment(
 	ctx context.Context,
 	store *v1.Store,
@@ -39,6 +41,7 @@ func StorefrontDeployment(store *v1.Store) *appsv1.Deployment {
 	maps.Copy(labels, util.GetDefaultLabels(store))
 
 	containers := append(store.Spec.Container.ExtraContainers, corev1.Container{
+		Name: DEPLOYMENT_STOREFRONT_CONTAINER_NAME,
 		LivenessProbe: &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				HTTPGet: &corev1.HTTPGetAction{
@@ -65,7 +68,6 @@ func StorefrontDeployment(store *v1.Store) *appsv1.Deployment {
 			TimeoutSeconds:      5,
 			InitialDelaySeconds: 5,
 		},
-		Name:            appName,
 		Image:           store.Spec.Container.Image,
 		ImagePullPolicy: store.Spec.Container.ImagePullPolicy,
 		Env:             store.GetEnv(),

internal/deployment/util.go

@@ -28,7 +28,7 @@ func GetStoreDeploymentImage(
 	}
 
 	for _, container := range search.Spec.Template.Spec.Containers {
-		if container.Name == GetStorefrontDeploymentName(store) {
+		if container.Name == DEPLOYMENT_STOREFRONT_CONTAINER_NAME {
 			return container.Image, nil
 		}
 	}

internal/job/setup.go

@@ -15,6 +15,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const CONTAINER_NAME_SETUP_JOB = "shopware-setup"
+
 func GetSetupJob(ctx context.Context, client client.Client, store *v1.Store) (*batchv1.Job, error) {
 	setup := SetupJob(store)
 	search := &batchv1.Job{
@@ -64,7 +66,7 @@ func SetupJob(store *v1.Store) *batchv1.Job {
 	)
 
 	containers := append(store.Spec.Container.ExtraContainers, corev1.Container{
-		Name:            "shopware-setup",
+		Name:            CONTAINER_NAME_SETUP_JOB,
 		ImagePullPolicy: store.Spec.Container.ImagePullPolicy,
 		Image:           store.Spec.Container.Image,
 		Command:         []string{"sh", "-c"},

internal/job/util.go

@@ -16,14 +16,15 @@ func IsJobContainerDone(
 	ctx context.Context,
 	c client.Client,
 	job *batchv1.Job,
+	containerName string,
 ) (bool, error) {
 
 	if job == nil {
 		return false, fmt.Errorf("job to check is nil")
 	}
 
 	for _, container := range job.Spec.Template.Spec.Containers {
-		if container.Name == job.Name {
+		if container.Name == containerName {
 			selector, err := labels.ValidatedSelectorFromSet(job.Labels)
 			if err != nil {
 				return false, fmt.Errorf("get selector: %w", err)
@@ -40,33 +41,37 @@ func IsJobContainerDone(
 				return false, fmt.Errorf("get pods: %w", err)
 			}
 
+			var isOneFinished bool
 			for _, pod := range pods.Items {
 				for _, c := range pod.Status.ContainerStatuses {
-					if c.Name == job.Name {
+					if c.Name == containerName {
 						if c.State.Terminated == nil {
-							log.FromContext(ctx).Info("Setup not terminated still running")
-							return false, nil
+							log.FromContext(ctx).Info("Job not terminated still running")
+							continue
 						}
 						if c.State.Terminated.ExitCode != 0 {
 							log.FromContext(ctx).
-								Info("Setup job has not 0 as exit code, check setup")
-							return false, fmt.Errorf(
-								"Errors in setup: %s",
-								c.State.Terminated.Reason,
-							)
+								Info("Job has not 0 as exit code, check job")
+							continue
 						}
-
 						if c.State.Terminated.Reason == "Completed" {
-							log.FromContext(ctx).Info("Setup job completed")
-							return true, nil
+							log.FromContext(ctx).Info("Job completed")
+							isOneFinished = true
 						}
 					}
 				}
 			}
+			if isOneFinished {
+				return true, nil
+			} else {
+				return false, nil
+			}
 		}
 	}
 
-	return false, nil
+	err := fmt.Errorf("job not found in container")
+	log.FromContext(ctx).Error(err, "job not found in container")
+	return false, err
 }
 
 func deleteJobsByLabel(