client-go should not take a dependency on the v1 api lightly

These constants will never change, and tools/ should not be depending on
core/api/v1 (there is nothing v1 specific about them).

Kubernetes-commit: aa9fd2bf11ae6be922b5b0fe45f5254c40366b2e
This commit is contained in:
Clayton Coleman 2018-04-25 18:02:30 -04:00 committed by Kubernetes Publisher
parent 9e6dfd5187
commit 7130d1acc2
2 changed files with 2 additions and 4 deletions

View File

@ -27,7 +27,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/imdario/mergo" "github.com/imdario/mergo"
"k8s.io/api/core/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
clientauth "k8s.io/client-go/tools/auth" clientauth "k8s.io/client-go/tools/auth"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -338,7 +337,7 @@ func (config *DirectClientConfig) Namespace() (string, bool, error) {
} }
if len(configContext.Namespace) == 0 { if len(configContext.Namespace) == 0 {
return v1.NamespaceDefault, false, nil return "default", false, nil
} }
return configContext.Namespace, false, nil return configContext.Namespace, false, nil

View File

@ -22,7 +22,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/api/core/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
) )
@ -145,7 +144,7 @@ func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) {
if len(ns) > 0 { if len(ns) > 0 {
// if we got a non-default namespace from the kubeconfig, use it // if we got a non-default namespace from the kubeconfig, use it
if ns != v1.NamespaceDefault { if ns != "default" {
return ns, false, nil return ns, false, nil
} }