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

UPSTREAM: 38925: Fix nil pointer issue when making mounts for container #13269

Merged
merged 1 commit into from
Mar 7, 2017

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Mar 7, 2017

Fixes #13263

Upstream (not yet merged):
kubernetes/kubernetes#38925

Related:
kubernetes/kubernetes#34251

Currently, there exists a gap in the kubelet state where the vol.Mounter can be nil. This was somewhat addressed by kubernetes/kubernetes#33616 but even upstream is still seeing the gap.

Simple check to protect against it is the previously excepted solution.

@smarterclayton @derekwaynecarr

@smarterclayton
Copy link
Contributor

LGTM, can you apply to 1.5 as well (I assume this needs to be 3.5.x)

@smarterclayton smarterclayton added this to the 1.5.0 milestone Mar 7, 2017
@smarterclayton smarterclayton added vendor-update Touching vendor dir or related files area/infrastructure and removed vendor-update Touching vendor dir or related files labels Mar 7, 2017
@smarterclayton
Copy link
Contributor

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 7005c14

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 7005c14

@openshift-bot
Copy link
Contributor

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

@smarterclayton
Copy link
Contributor

smarterclayton commented Mar 7, 2017 via email

@openshift-bot openshift-bot merged commit 9d1a9a6 into openshift:master Mar 7, 2017
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/890/) (Base Commit: 1a2cfff)

@sjenning sjenning deleted the fix-nil-mounter branch August 16, 2017 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants