diff --git a/cmd/apply.go b/cmd/apply.go index e757356247d3583404c8153d8ba15a9acc95eea0..0cb9cd04b492423db87f487f5eb134e03de9f446 100644 --- a/cmd/apply.go +++ b/cmd/apply.go @@ -108,7 +108,7 @@ var applyCmd = &cobra.Command{ return err } - c.DefaultNamespace, err = defaultNamespace(clientConfig) + c.DefaultNamespace, err = defaultNamespace() if err != nil { return err } diff --git a/cmd/delete.go b/cmd/delete.go index c0f12025efc41a5f5a9544a5c677e363a0a0cb2b..7bdb010fabd0b510faecdbbcc1001934c17b7a01 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -71,7 +71,7 @@ var deleteCmd = &cobra.Command{ return err } - c.DefaultNamespace, err = defaultNamespace(clientConfig) + c.DefaultNamespace, err = defaultNamespace() if err != nil { return err } diff --git a/cmd/diff.go b/cmd/diff.go index cf048ff1e3c4c7f7c1fe4de29f0d12bbcb3b1acc..ab30a408a3f4066b22c0aa7d5c9b931176da25f9 100644 --- a/cmd/diff.go +++ b/cmd/diff.go @@ -69,7 +69,7 @@ var diffCmd = &cobra.Command{ return err } - c.DefaultNamespace, err = defaultNamespace(clientConfig) + c.DefaultNamespace, err = defaultNamespace() if err != nil { return err } diff --git a/cmd/root.go b/cmd/root.go index 3aab157eca2a0937344e393484ba40e8d53f049e..21bba34b394aef78d07e2cdfdf5ebf333e86b95b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -122,11 +122,11 @@ var RootCmd = &cobra.Command{ // clientConfig.Namespace() is broken in client-go 3.0: // namespace in config erroneously overrides explicit --namespace -func defaultNamespace(c clientcmd.ClientConfig) (string, error) { +func defaultNamespace() (string, error) { if overrides.Context.Namespace != "" { return overrides.Context.Namespace, nil } - ns, _, err := c.Namespace() + ns, _, err := clientConfig.Namespace() return ns, err } diff --git a/cmd/update.go b/cmd/update.go index a38559de7981d00365d5967da042da94d1fab8f3..d483ad19d11807aba3941b2ed3967bb2d20d5513 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -84,7 +84,7 @@ local configuration. Accepts JSON, YAML, or Jsonnet.`, return err } - c.DefaultNamespace, err = defaultNamespace(clientConfig) + c.DefaultNamespace, err = defaultNamespace() if err != nil { return err }