refactor: restartHelper.disable -> restartHelper.inject

Author: FabianKramm

pkg/devspace/build/builder/restart/restart.go

@@ -70,10 +70,10 @@ counter=0
 while ! [ -f $touchFile ]; do
   if [ "$counter" = "0" ]; then
     echo "Container started with restart helper."
-    echo "Waiting for initial sync to complete before starting application..."
+    echo "Waiting for initial sync to complete or file $touchFile to exist before starting the application..."
   else
     if [ "$counter" = 10 ]; then
-      echo "(Still waiting for initial sync to complete)"
+      echo "(Still waiting...)"
       counter=0
     fi
   fi
@@ -82,7 +82,7 @@ while ! [ -f $touchFile ]; do
 done
 
 if ! [ "$counter" = "0" ]; then
-  echo "Initial sync completed. Starting application..."
+  echo "Starting application..."
 fi
 
 while $restart; do

pkg/devspace/config/versions/latest/schema.go

@@ -856,8 +856,8 @@ type RestartHelper struct {
 	// Path defines the path to the restart helper that might be used if certain config
 	// options are enabled
 	Path string `yaml:"path,omitempty" json:"path,omitempty"`
-	// Disable signals DevSpace to not inject the restart helper
-	Disable bool `yaml:"disable,omitempty" json:"disable,omitempty"`
+	// Inject signals DevSpace to inject the restart helper
+	Inject *bool `yaml:"inject,omitempty" json:"inject,omitempty"`
 }
 
 type ProxyCommand struct {

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -774,7 +774,7 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
 			if devPods[k].Containers[i].RestartHelper == nil {
 				devPods[k].Containers[i].RestartHelper = &next.RestartHelper{}
 			}
-			devPods[k].Containers[i].RestartHelper.Disable = true
+			devPods[k].Containers[i].RestartHelper.Inject = ptr.Bool(false)
 		}
 	}
 

pkg/devspace/devpod/devpod.go

@@ -539,6 +539,9 @@ func needPodReplaceContainer(devContainer *latest.DevContainer) bool {
 	if len(devContainer.PersistPaths) > 0 {
 		return true
 	}
+	if devContainer.RestartHelper != nil && devContainer.RestartHelper.Inject != nil && *devContainer.RestartHelper.Inject {
+		return true
+	}
 	if devContainer.Terminal != nil && !devContainer.Terminal.DisableReplace && (devContainer.Terminal.Enabled == nil || *devContainer.Terminal.Enabled) {
 		return true
 	}
@@ -554,7 +557,7 @@ func needPodReplaceContainer(devContainer *latest.DevContainer) bool {
 	if devContainer.Args != nil {
 		return true
 	}
-	if devContainer.RestartHelper == nil || !devContainer.RestartHelper.Disable {
+	if devContainer.RestartHelper == nil || devContainer.RestartHelper.Inject == nil || *devContainer.RestartHelper.Inject {
 		for _, s := range devContainer.Sync {
 			if s.OnUpload != nil && s.OnUpload.RestartContainer {
 				return true

pkg/devspace/services/podreplace/builder.go

@@ -242,16 +242,16 @@ func replaceWorkingDir(ctx *devspacecontext.Context, devPod *latest.DevPod, devC
 
 func replaceCommand(ctx *devspacecontext.Context, devPod *latest.DevPod, devContainer *latest.DevContainer, podTemplate *corev1.PodTemplateSpec) error {
 	// replace with DevSpace helper
-	injectRestartHelper := false
-	if devContainer.RestartHelper == nil || !devContainer.RestartHelper.Disable {
+	injectRestartHelper := devContainer.RestartHelper != nil && devContainer.RestartHelper.Inject != nil && *devContainer.RestartHelper.Inject
+	if devContainer.RestartHelper == nil || devContainer.RestartHelper.Inject == nil || *devContainer.RestartHelper.Inject {
 		for _, s := range devContainer.Sync {
 			if s.StartContainer || (s.OnUpload != nil && s.OnUpload.RestartContainer) {
 				injectRestartHelper = true
 			}
 		}
 	}
 	if len(devContainer.Command) == 0 && injectRestartHelper {
-		return fmt.Errorf("dev.%s.sync[*].onUpload.restartContainer is true, please specify the entrypoint that should get restarted in dev.%s.command", devPod.Name, devPod.Name)
+		return fmt.Errorf("dev.%s.sync[*].onUpload.restartContainer or dev.%s.restartHelper.inject is true, please specify the entrypoint that should get restarted in dev.%s.command", devPod.Name, devPod.Name, devPod.Name)
 	}
 	if !injectRestartHelper && len(devContainer.Command) == 0 && devContainer.Args == nil {
 		return nil