Skip to content

Bug 1425706 - protect from nil tlsConfig. #13072

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
Feb 24, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Feb 23, 2017

In very special case (client config does not contain ca cert nor auth cert nor
set tls-insecure), tlsConfig can be nil and no error is returned from TLSConfigFor
either, thus we need to check for nil on tlsConfig before proceeding in
image pruning.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1425706.

@miminar || @legionus ptal

In very special case (client config does not contain ca cert nor auth cert nor
set tls-insecure), tlsConfig can be nil and no error is returned from TLSConfigFor
either, thus we need to check for nil on tlsConfig before proceeding in
image pruning.
@soltysh
Copy link
Contributor Author

soltysh commented Feb 23, 2017

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 174e3dd

Copy link

@miminar miminar left a comment

Choose a reason for hiding this comment

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

LGTM

@legionus
Copy link
Contributor

LGTM

@soltysh
Copy link
Contributor Author

soltysh commented Feb 23, 2017

Will merge on green tests.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/470/) (Base Commit: 80b2f6d)

@soltysh
Copy link
Contributor Author

soltysh commented Feb 23, 2017

Flake #12784, otherwise it's green.

[merge]

@soltysh
Copy link
Contributor Author

soltysh commented Feb 24, 2017

Flake #13097.

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 174e3dd

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 24, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/539/) (Base Commit: f1dd3c7) (Image: devenv-rhel7_5970)

@openshift-bot openshift-bot merged commit a663373 into openshift:master Feb 24, 2017
@soltysh soltysh deleted the bug1425706 branch February 24, 2017 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants