github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3844 from mikedanese/dockercfg-dirs

Browse Source 
Check other dirs for .dockercfg
This commit is contained in:
Tim Hockin
2015-01-28 08:50:08 -08:00
parent 586c7c80b2 33f158073b
commit 80ff2128de
4 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/kubelet.go
View File

@@ -27,6 +27,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports"
@@ -127,6 +128,8 @@ func main() {
glog.Warningf("No API client: %v", err)
}
credentialprovider.SetPreferredDockercfgPath(*rootDirectory)
kcfg := standalone.KubeletConfig{
Address: address,
AllowPrivileged: *allowPrivileged,