Skip to content
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

Bug 1425706 - protect from nil tlsConfig. #13073

Merged
merged 1 commit into from
Feb 23, 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.

@mfojtik || @pweil- this is the cherry-pick for blocker bug from yesterday ptal: https://bugzilla.redhat.com/show_bug.cgi?id=1425706

The master PR is #13072.

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.
@mfojtik
Copy link
Contributor

mfojtik commented Feb 23, 2017

LGTM

@mfojtik mfojtik added this to the 1.5.0 milestone Feb 23, 2017
@pweil-
Copy link

pweil- commented Feb 23, 2017

[test][merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 32f4837

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 23, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/492/) (Image: devenv-rhel7_5968)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 32f4837

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/492/) (Base Commit: cf5b77f)

@openshift-bot openshift-bot merged commit 2e2a6d6 into openshift:release-1.5 Feb 23, 2017
@soltysh soltysh deleted the bug1425706_1.5 branch February 24, 2017 10:03
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