Merge pull request #2216 from tukobadnyanoba/support-for-kubeconfig-flag-in-devspace

FabianKramm · web-flow · commit b7ffc1a05a34 · 2022-08-15T07:46:50.000-07:00
added support for kubeconfig flag in devspace
diff --git a/cmd/analyze.go b/cmd/analyze.go
@@ -84,7 +84,7 @@ func (cmd *AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd *cobra.Command, ar
 		}
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/attach.go b/cmd/attach.go
@@ -87,7 +87,7 @@ func (cmd *AttachCmd) Run(f factory.Factory, cobraCmd *cobra.Command, args []str
 			return err
 		}
 
-		// If the current kube context or namespace is different than old,
+		// 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)
 		if err != nil {
diff --git a/cmd/enter.go b/cmd/enter.go
@@ -114,7 +114,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {
 			return err
 		}
 
-		// If the current kube context or namespace is different than old,
+		// 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)
 		if err != nil {
diff --git a/cmd/flags/flags.go b/cmd/flags/flags.go
@@ -7,21 +7,20 @@ import (
 
 // GlobalFlags is the flags that contains the global flags
 type GlobalFlags struct {
-	Silent bool
-	NoWarn bool
-	Debug  bool
-
+	Silent                   bool
+	NoWarn                   bool
+	Debug                    bool
+	DisableProfileActivation bool
+	SwitchContext            bool
+	InactivityTimeout        int
+	KubeConfig               string
 	OverrideName             string
 	Namespace                string
 	KubeContext              string
-	Profiles                 []string
-	DisableProfileActivation bool
-	SwitchContext            bool
 	ConfigPath               string
+	Profiles                 []string
 	Vars                     []string
 
-	InactivityTimeout int
-
 	Flags *flag.FlagSet
 }
 
@@ -55,6 +54,7 @@ func SetGlobalFlags(flags *flag.FlagSet) *GlobalFlags {
 	flags.StringVarP(&globalFlags.Namespace, "namespace", "n", "", "The kubernetes namespace to use")
 	flags.StringVar(&globalFlags.KubeContext, "kube-context", "", "The kubernetes context to use")
 	flags.StringSliceVar(&globalFlags.Vars, "var", []string{}, "Variables to override during execution (e.g. --var=MYVAR=MYVALUE)")
+	flags.StringVar(&globalFlags.KubeConfig, "kubeconfig", "", "The kubeconfig path to use")
 
 	flags.IntVar(&globalFlags.InactivityTimeout, "inactivity-timeout", 0, "Minutes the current user is inactive (no mouse or keyboard interaction) until DevSpace will exit automatically. 0 to disable. Only supported on windows and mac operating systems")
 	flags.AddFlag(&flag.Flag{
diff --git a/cmd/list/deployments.go b/cmd/list/deployments.go
@@ -78,7 +78,7 @@ func (cmd *deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd *cob
 		return err
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/list/namespaces.go b/cmd/list/namespaces.go
@@ -69,7 +69,7 @@ func (cmd *namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd *cobra.C
 		}
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/logs.go b/cmd/logs.go
@@ -104,7 +104,7 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {
 			return err
 		}
 
-		// If the current kube context or namespace is different than old,
+		// 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)
 		if err != nil {
diff --git a/cmd/open.go b/cmd/open.go
@@ -126,7 +126,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {
 		}
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/reset/pods.go b/cmd/reset/pods.go
@@ -80,7 +80,7 @@ func (cmd *podsCmd) RunResetPods(f factory.Factory, cobraCmd *cobra.Command, arg
 		return err
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/restart.go b/cmd/restart.go
@@ -106,7 +106,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 		return err
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/root.go b/cmd/root.go
@@ -62,6 +62,13 @@ func NewRootCmd(f factory.Factory) *cobra.Command {
 				log.SetLevel(logrus.DebugLevel)
 			}
 
+			if globalFlags.KubeConfig != "" {
+				err := os.Setenv("KUBECONFIG", globalFlags.KubeConfig)
+				if err != nil {
+					log.Errorf("Unable to set KUBECONFIG variable: %v", err)
+				}
+			}
+
 			// parse the .env file
 			envFile := env.GlobalGetEnv("DEVSPACE_ENV_FILE")
 			if envFile != "" {
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -162,7 +162,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		return errors.Wrap(err, "new kube client")
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/cmd/ui.go b/cmd/ui.go
@@ -154,7 +154,7 @@ func (cmd *UICmd) RunUI(f factory.Factory) error {
 		}
 	}
 
-	// If the current kube context or namespace is different than old,
+	// 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)
 	if err != nil {
diff --git a/docs/pages/configuration/dev/connections/file-sync.mdx b/docs/pages/configuration/dev/connections/file-sync.mdx
@@ -250,7 +250,7 @@ The `initialSync` option expects a string with an initial sync strategy. The fol
 `mirrorLocal` mirrors the local filesystem inside the container (default)  
   1. deletes all files inside the conainer that are not existing on the local filesystem
   2. uploads all files which are existing on the local filesystem but are missing within the container
-  3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different than on the local filesystem)
+  3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different from on the local filesystem)
 
 `preferLocal` is like `mirrorLocal` but skips step 1.
 
diff --git a/docs/versioned_docs/version-4.x/configuration/development/file-synchronization.mdx b/docs/versioned_docs/version-4.x/configuration/development/file-synchronization.mdx
@@ -464,7 +464,7 @@ The `initialSync` option expects a string with an initial sync strategy. The fol
 
 1. deletes all files inside the conainer that are not existing on the local filesystem
 2. uploads all files which are existing on the local filesystem but are missing within the container
-3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different than on the local filesystem)
+3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different from on the local filesystem)
 
 #### • `preferLocal` is like `mirrorLocal` but skips step 1.
 
diff --git a/docs/versioned_docs/version-5.x/configuration/development/file-synchronization.mdx b/docs/versioned_docs/version-5.x/configuration/development/file-synchronization.mdx
@@ -521,7 +521,7 @@ The `initialSync` option expects a string with an initial sync strategy. The fol
 
 1. deletes all files inside the conainer that are not existing on the local filesystem
 2. uploads all files which are existing on the local filesystem but are missing within the container
-3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different than on the local filesystem)
+3. resolves all file conflicts (different content on local filesystem than in inside the container) by preferring the file on the local filesystem (i.e. all files in the container will be replaced if they are different from on the local filesystem)
 
 #### • `preferLocal` is like `mirrorLocal` but skips step 1.
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (cmd AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd cobra.Command, ar`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- // If the current kube context or namespace is different than old,`
	`87`	`+ // If the current kube context or namespace is different from old,`
`88`	`88`	`// show warnings and reset kube client if necessary`
`89`	`89`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
`90`	`90`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (cmd AttachCmd) Run(f factory.Factory, cobraCmd cobra.Command, args []str`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`
`90`		`- // If the current kube context or namespace is different than old,`
	`90`	`+ // If the current kube context or namespace is different from old,`
`91`	`91`	`// show warnings and reset kube client if necessary`
`92`	`92`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
`93`	`93`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {`
`114`	`114`	`return err`
`115`	`115`	`}`
`116`	`116`
`117`		`- // If the current kube context or namespace is different than old,`
	`117`	`+ // If the current kube context or namespace is different from old,`
`118`	`118`	`// show warnings and reset kube client if necessary`
`119`	`119`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`120`	`120`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (cmd deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd cob`
`78`	`78`	`return err`
`79`	`79`	`}`
`80`	`80`
`81`		`- // If the current kube context or namespace is different than old,`
	`81`	`+ // If the current kube context or namespace is different from old,`
`82`	`82`	`// show warnings and reset kube client if necessary`
`83`	`83`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`84`	`84`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (cmd namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd cobra.C`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- // If the current kube context or namespace is different than old,`
	`72`	`+ // If the current kube context or namespace is different from old,`
`73`	`73`	`// show warnings and reset kube client if necessary`
`74`	`74`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`75`	`75`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {`
`104`	`104`	`return err`
`105`	`105`	`}`
`106`	`106`
`107`		`- // If the current kube context or namespace is different than old,`
	`107`	`+ // If the current kube context or namespace is different from old,`
`108`	`108`	`// show warnings and reset kube client if necessary`
`109`	`109`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
`110`	`110`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`- // If the current kube context or namespace is different than old,`
	`129`	`+ // If the current kube context or namespace is different from old,`
`130`	`130`	`// show warnings and reset kube client if necessary`
`131`	`131`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`132`	`132`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (cmd podsCmd) RunResetPods(f factory.Factory, cobraCmd cobra.Command, arg`
`80`	`80`	`return err`
`81`	`81`	`}`
`82`	`82`
`83`		`- // If the current kube context or namespace is different than old,`
	`83`	`+ // If the current kube context or namespace is different from old,`
`84`	`84`	`// show warnings and reset kube client if necessary`
`85`	`85`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`86`	`86`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {`
`106`	`106`	`return err`
`107`	`107`	`}`
`108`	`108`
`109`		`- // If the current kube context or namespace is different than old,`
	`109`	`+ // If the current kube context or namespace is different from old,`
`110`	`110`	`// show warnings and reset kube client if necessary`
`111`	`111`	`client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`112`	`112`	`if err != nil {`