diff --git a/api/v1/env.go b/api/v1/env.go index ceac964..03451a6 100644 --- a/api/v1/env.go +++ b/api/v1/env.go @@ -125,9 +125,9 @@ func (s *Store) getWorker() []corev1.EnvVar { Name: "MESSENGER_TRANSPORT_DSN", Value: fmt.Sprintf( "rediss://%s:%d/messages/symfony/consumer?auto_setup=true&serializer=1&stream_max_entries=0&dbindex=%d", - s.Spec.AppCache.RedisHost, - s.Spec.AppCache.RedisPort, - s.Spec.AppCache.RedisIndex, + s.Spec.Worker.RedisHost, + s.Spec.Worker.RedisPort, + s.Spec.Worker.RedisIndex, ), }, } diff --git a/internal/job/migration.go b/internal/job/migration.go index f1e62dc..336736c 100644 --- a/internal/job/migration.go +++ b/internal/job/migration.go @@ -52,13 +52,13 @@ func MigrationJob(store *v1.Store) *batchv1.Job { } maps.Copy(annotations, store.Spec.Container.Annotations) - var command string - if store.Spec.MigrationHook.Before != "" { - command = fmt.Sprintf("%s && ", store.Spec.MigrationHook.Before) + var command []string + if store.Spec.SetupHook.Before != "" { + command = append(command, store.Spec.MigrationHook.Before) } - command = fmt.Sprintf("%s /setup", command) - if store.Spec.MigrationHook.After != "" { - command = fmt.Sprintf("%s && %s", command, store.Spec.MigrationHook.After) + command = append(command, " /setup") + if store.Spec.SetupHook.After != "" { + command = append(command, store.Spec.MigrationHook.After) } containers := append(store.Spec.Container.ExtraContainers, corev1.Container{ @@ -67,7 +67,7 @@ func MigrationJob(store *v1.Store) *batchv1.Job { ImagePullPolicy: store.Spec.Container.ImagePullPolicy, Image: store.Spec.Container.Image, Command: []string{"sh", "-c"}, - Args: []string{command}, + Args: command, Env: store.GetEnv(), }) diff --git a/internal/job/setup.go b/internal/job/setup.go index bb8d31c..b4b166f 100644 --- a/internal/job/setup.go +++ b/internal/job/setup.go @@ -38,13 +38,13 @@ func SetupJob(store *v1.Store) *batchv1.Job { } maps.Copy(labels, util.GetDefaultLabels(store)) - var command string + var command []string if store.Spec.SetupHook.Before != "" { - command = fmt.Sprintf("%s && ", store.Spec.SetupHook.Before) + command = append(command, store.Spec.SetupHook.Before) } - command = fmt.Sprintf("%s /setup", command) + command = append(command, " /setup") if store.Spec.SetupHook.After != "" { - command = fmt.Sprintf("%s && %s", command, store.Spec.SetupHook.After) + command = append(command, store.Spec.SetupHook.After) } envs := append(store.GetEnv(), @@ -71,7 +71,7 @@ func SetupJob(store *v1.Store) *batchv1.Job { ImagePullPolicy: store.Spec.Container.ImagePullPolicy, Image: store.Spec.Container.Image, Command: []string{"sh", "-c"}, - Args: []string{command}, + Args: command, Env: envs, })