Merge pull request #2281 from FabianKramm/main

FabianKramm · web-flow · commit fdc091f467c7 · 2022-09-06T16:57:51.000+02:00
feat: add DevSpace sleep mode handling
diff --git a/cmd/analyze.go b/cmd/analyze.go
@@ -86,7 +86,7 @@ func (cmd *AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd *cobra.Command, ar
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/attach.go b/cmd/attach.go
@@ -89,7 +89,7 @@ func (cmd *AttachCmd) Run(f factory.Factory, cobraCmd *cobra.Command, args []str
 
 		// If the current kube context or namespace is different from old,
 		// show warnings and reset kube client if necessary
-		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)
+		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/enter.go b/cmd/enter.go
@@ -118,7 +118,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {
 
 		// If the current kube context or namespace is different from old,
 		// show warnings and reset kube client if necessary
-		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
+		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/list/deployments.go b/cmd/list/deployments.go
@@ -80,7 +80,7 @@ func (cmd *deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd *cob
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/list/namespaces.go b/cmd/list/namespaces.go
@@ -71,7 +71,7 @@ func (cmd *namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd *cobra.C
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/logs.go b/cmd/logs.go
@@ -106,7 +106,7 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {
 
 		// If the current kube context or namespace is different from old,
 		// show warnings and reset kube client if necessary
-		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)
+		client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/open.go b/cmd/open.go
@@ -128,7 +128,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/reset/pods.go b/cmd/reset/pods.go
@@ -82,7 +82,7 @@ func (cmd *podsCmd) RunResetPods(f factory.Factory, cobraCmd *cobra.Command, arg
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/restart.go b/cmd/restart.go
@@ -108,7 +108,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/run_pipeline.go b/cmd/run_pipeline.go
@@ -309,7 +309,7 @@ func initialize(ctx context.Context, f factory.Factory, options *CommandOptions,
 	if client != nil {
 		// If the current kube context or namespace is different than old,
 		// show warnings and reset kube client if necessary
-		client, err = kubectl.CheckKubeContext(client, localCache, options.NoWarn, options.SwitchContext, logger)
+		client, err = kubectl.CheckKubeContext(client, localCache, options.NoWarn, options.SwitchContext, false, logger)
 		if err != nil {
 			return nil, err
 		}
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -164,7 +164,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/ui.go b/cmd/ui.go
@@ -156,7 +156,7 @@ func (cmd *UICmd) RunUI(f factory.Factory) error {
 
 	// If the current kube context or namespace is different from old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/devspace/config/loader/imports.go b/pkg/devspace/config/loader/imports.go
@@ -3,16 +3,15 @@ package loader
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
-	"path/filepath"
-
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/util"
 	dependencyutil "github.com/loft-sh/devspace/pkg/devspace/dependency/util"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/yamlutil"
 	"github.com/pkg/errors"
+	"io/ioutil"
+	"path/filepath"
 )
 
 var ImportSections = []string{
diff --git a/pkg/devspace/config/loader/parser.go b/pkg/devspace/config/loader/parser.go
@@ -125,7 +125,7 @@ func fillVariablesExcludeAndParse(ctx context.Context, resolver variable.Resolve
 }
 
 func fillVariablesAndParse(ctx context.Context, resolver variable.Resolver, preparedConfig map[string]interface{}, log log.Logger, excludedPaths ...string) (*latest.Config, map[string]interface{}, error) {
-	// fill in variables and expressions (leave out
+	// fill in variables and expressions
 	preparedConfigInterface, err := resolver.FillVariablesExclude(ctx, preparedConfig, excludedPaths)
 	if err != nil {
 		return nil, nil, err
diff --git a/pkg/devspace/devpod/devpod.go b/pkg/devspace/devpod/devpod.go
@@ -166,7 +166,9 @@ func (d *devPod) startWithRetry(ctx devspacecontext.Context, devPodConfig *lates
 				return true, nil
 			}, ctx.Context().Done())
 			if err != nil {
-				ctx.Log().Errorf("error restarting dev: %v", err)
+				if err != wait.ErrWaitTimeout {
+					ctx.Log().Errorf("error restarting dev: %v", err)
+				}
 			} else if shouldRestart {
 				d.restart(ctx, devPodConfig, options)
 				return
diff --git a/pkg/devspace/kubectl/client.go b/pkg/devspace/kubectl/client.go
diff --git a/pkg/devspace/kubectl/client_test.go b/pkg/devspace/kubectl/client_test.go
diff --git a/pkg/devspace/kubectl/util/util.go b/pkg/devspace/kubectl/util/util.go
diff --git a/pkg/devspace/services/logs/logs.go b/pkg/devspace/services/logs/logs.go
diff --git a/pkg/util/downloader/commands/kubectl.go b/pkg/util/downloader/commands/kubectl.go
diff --git a/pkg/util/factory/factory.go b/pkg/util/factory/factory.go
diff --git a/pkg/util/factory/testing/factory.go b/pkg/util/factory/testing/factory.go

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (cmd AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd cobra.Command, ar`
`86`	`86`
`87`	`87`	`// If the current kube context or namespace is different from old,`
`88`	`88`	`// show warnings and reset kube client if necessary`
`89`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
	`89`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (cmd AttachCmd) Run(f factory.Factory, cobraCmd cobra.Command, args []str`
`89`	`89`
`90`	`90`	`// If the current kube context or namespace is different from old,`
`91`	`91`	`// show warnings and reset kube client if necessary`
`92`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
	`92`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)`
`93`	`93`	`if err != nil {`
`94`	`94`	`return err`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {`
`118`	`118`
`119`	`119`	`// If the current kube context or namespace is different from old,`
`120`	`120`	`// show warnings and reset kube client if necessary`
`121`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
	`121`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)`
`122`	`122`	`if err != nil {`
`123`	`123`	`return err`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (cmd deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd cob`
`80`	`80`
`81`	`81`	`// If the current kube context or namespace is different from old,`
`82`	`82`	`// show warnings and reset kube client if necessary`
`83`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
	`83`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)`
`84`	`84`	`if err != nil {`
`85`	`85`	`return err`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (cmd namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd cobra.C`
`71`	`71`
`72`	`72`	`// If the current kube context or namespace is different from old,`
`73`	`73`	`// show warnings and reset kube client if necessary`
`74`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
	`74`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, logger)`
`75`	`75`	`if err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {`
`106`	`106`
`107`	`107`	`// If the current kube context or namespace is different from old,`
`108`	`108`	`// show warnings and reset kube client if necessary`
`109`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
	`109`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, log)`
`110`	`110`	`if err != nil {`
`111`	`111`	`return err`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {`
`128`	`128`
`129`	`129`	`// If the current kube context or namespace is different from old,`
`130`	`130`	`// show warnings and reset kube client if necessary`
`131`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
	`131`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)`
`132`	`132`	`if err != nil {`
`133`	`133`	`return err`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (cmd podsCmd) RunResetPods(f factory.Factory, cobraCmd cobra.Command, arg`
`82`	`82`
`83`	`83`	`// If the current kube context or namespace is different from old,`
`84`	`84`	`// show warnings and reset kube client if necessary`
`85`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
	`85`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)`
`86`	`86`	`if err != nil {`
`87`	`87`	`return err`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {`
`108`	`108`
`109`	`109`	`// If the current kube context or namespace is different from old,`
`110`	`110`	`// show warnings and reset kube client if necessary`
`111`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
	`111`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, false, cmd.log)`
`112`	`112`	`if err != nil {`
`113`	`113`	`return err`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ func initialize(ctx context.Context, f factory.Factory, options *CommandOptions,`
`309`	`309`	`if client != nil {`
`310`	`310`	`// If the current kube context or namespace is different than old,`
`311`	`311`	`// show warnings and reset kube client if necessary`
`312`		`- client, err = kubectl.CheckKubeContext(client, localCache, options.NoWarn, options.SwitchContext, logger)`
	`312`	`+ client, err = kubectl.CheckKubeContext(client, localCache, options.NoWarn, options.SwitchContext, false, logger)`
`313`	`313`	`if err != nil {`
`314`	`314`	`return nil, err`
`315`	`315`	`}`