Skip to content

K
k3s
Commit d56ec66e authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #23667 from yifan-gu/config

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
parents 16e2e87a e803f55e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
pkg/kubelet/rkt/image.go
View file @ d56ec66e
...@@ -196,11 +196,15 @@ func (r *Runtime) writeDockerAuthConfig(image string, credsSlice []credentialpro ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment