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

Merge pull request #23667 from yifan-gu/config

Browse Source 
Automatic merge from submit-queue

rkt: Update the directory path for saving auth config.

Since #23308 is merged, now we have more stable way to determine where to store the auth configs.

cc @yujuhong @sjpotter
This commit is contained in:
k8s-merge-robot
2016-04-15 03:22:44 -07:00
parent 16e2e87a89 e803f55e20
commit d56ec66e7c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/rkt/image.go
View File

@@ -196,11 +196,15 @@ func (r *Runtime) writeDockerAuthConfig(image string, credsSlice []credentialpro
registry = strings.Split(image, "/")[0] registry = strings.Split(image, "/")[0]
} }
localConfigDir := rktLocalConfigDir configDir := r.config.UserConfigDir
if r.config.LocalConfigDir != "" { if configDir == "" {
localConfigDir = r.config.LocalConfigDir configDir = r.config.LocalConfigDir
} }
authDir := path.Join(localConfigDir, "auth.d") if configDir == "" {
return fmt.Errorf("No user or local config dir is specified")
}
authDir := path.Join(configDir, "auth.d")
if _, err := os.Stat(authDir); os.IsNotExist(err) { if _, err := os.Stat(authDir); os.IsNotExist(err) {
if err := os.Mkdir(authDir, 0600); err != nil { if err := os.Mkdir(authDir, 0600); err != nil {
glog.Errorf("rkt: Cannot create auth dir: %v", err) glog.Errorf("rkt: Cannot create auth dir: %v", err)