github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-31 06:41:52 +00:00
Code Issues Projects Releases Wiki Activity

Stop treating in-cluster-config namespace as an override

Browse Source 
Kubernetes-commit: 1305559abbcd1e5558980062221ed3e65a8f0387
This commit is contained in:
Jordan Liggitt 2017-04-24 11:49:10 -04:00 committed by Kubernetes Publisher
parent 714e60e890
commit 21a475eefb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/clientcmd/client_config.go
View File

@ -482,13 +482,13 @@ func (config *inClusterClientConfig) Namespace() (string, bool, error) {
// This way assumes you've set the POD_NAMESPACE environment variable using the downward API.
// This check has to be done first for backwards compatibility with the way InClusterConfig was originally set up
if ns := os.Getenv("POD_NAMESPACE"); ns != "" {
return ns, true, nil
return ns, false, nil
}
// Fall back to the namespace associated with the service account token, if available
if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
return ns, true, nil
return ns, false, nil
}
}