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.

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

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Sep 12, 2018

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 12, 2018
@bparees
Copy link
Contributor Author

bparees commented Sep 12, 2018

/assign @deads2k @mfojtik

I assume this does not need to be put in master because you've probably gutted this logic, correct?

@bparees
Copy link
Contributor Author

bparees commented Sep 12, 2018

/retest

@bparees bparees added this to the v3.11 milestone Sep 12, 2018
@bparees bparees added lgtm Indicates that a PR is ready to be merged. retest-not-required labels Sep 12, 2018
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2018
@bparees bparees added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2018
@bparees
Copy link
Contributor Author

bparees commented Sep 12, 2018

/retest

@@ -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

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

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

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

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

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

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.

@openshift-merge-robot openshift-merge-robot merged commit e5b3caf into openshift:release-3.11 Sep 12, 2018
@bparees bparees deleted the creds branch September 19, 2018 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. retest-not-required size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants