Merge pull request #20955 from bparees/creds

openshift-merge-robot · web-flow · commit e5b3caf6d5c6 · 2018-09-12T14:31:57.000-07:00
treat missing .docker/config.json as a warning, not an error
diff --git a/pkg/oc/clusteradd/components/default-imagestreams/create_secret.go b/pkg/oc/clusteradd/components/default-imagestreams/create_secret.go
@@ -75,7 +75,8 @@ func (opt *installReadyDockerConfigSecret) Install(dockerClient dockerhelper.Int
 
 	dockerConfigJsonBytes, err := ioutil.ReadFile(path.Join(home, ".docker", "config.json"))
 	if err != nil {
-		return fmt.Errorf("Error reading $HOME/.docker/config.json: %v", err)
+		glog.Warningf("Error reading $HOME/.docker/config.json: %v, imagestream import credentials will not be setup", err)
+		return nil
 	}
 
 	glog.Infof("Installing %q", opt.Name())

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ func (opt *installReadyDockerConfigSecret) Install(dockerClient dockerhelper.Int`
`75`	`75`
`76`	`76`	`dockerConfigJsonBytes, err := ioutil.ReadFile(path.Join(home, ".docker", "config.json"))`
`77`	`77`	`if err != nil {`
`78`		`- return fmt.Errorf("Error reading $HOME/.docker/config.json: %v", err)`
	`78`	`+ glog.Warningf("Error reading $HOME/.docker/config.json: %v, imagestream import credentials will not be setup", err)`
	`79`	`+ return nil`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`glog.Infof("Installing %q", opt.Name())`