Skip to content

treat missing .docker/config.json as a warning, not an error #20955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2018
Merged

treat missing .docker/config.json as a warning, not an error #20955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/oc/clusteradd/components/default-imagestreams/create_secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@smarterclayton smarterclayton Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are you returning?

Copy link
Contributor Author

@bparees bparees Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because if we can't read the config.json we can't create the import secret from the config.json.

Copy link
Contributor

@smarterclayton smarterclayton Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't be returning here.

Copy link
Contributor Author

@bparees bparees Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the idea here is to throw the warning and then proceed w/ installing the imagestreams anyway (which may or may not import successfully) rather than fail the whole startup.

Copy link
Contributor

@smarterclayton smarterclayton Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

returning will won't continue to install the things...

Copy link
Contributor

@smarterclayton smarterclayton Sep 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, this is installing the secret.

}

glog.Infof("Installing %q", opt.Name())
Expand Down