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.

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

Jump to bottom

Automated cherry pick of #23435 #24244

Merged
merged 1 commit into from
Apr 20, 2016
Merged

Automated cherry pick of #23435 #24244

merged 1 commit into from
Apr 20, 2016

Conversation

jsafrane
Copy link
Member

Cherry pick of #23435 on release-1.2.

@jsafrane
Fixed mounting with containerized kubelet.
60b117b 
Kubelet was not able to mount volumes when running inside a container and
using nsenter mounter,

NsenterMounter.IsLikelyNotMountPoint() should return ErrNotExist when the
checked directory does not exists as the regular mounted does this and
some volume plugins depend on this behavior.
@jsafrane jsafrane mentioned this pull request Apr 14, 2016
Merged
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 14, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 14, 2016

GCE e2e build/test passed for commit 60b117b.

@brendandburns
Copy link
Contributor

over to @thockin since he LGTM'd for cherry-pick approval.

@thockin
Copy link
Member

thockin commented Apr 18, 2016

The cherry pick LGTM, but we're not doing cherry picks this way any longer. Instead, flag the original PR as a cherrypick-candidate and set milestone to 1.2

@david-mcmahon should we delete the cherry-pick tool or make it print something?

@jsafrane
Copy link
Member Author

@thockin, I can't label PRs

@thockin
Copy link
Member

thockin commented Apr 18, 2016

I'll see if I can fix that

@thockin
Copy link
Member

thockin commented Apr 18, 2016

and it is already labelled for CP

@thockin thockin closed this Apr 18, 2016
@david-mcmahon
Copy link
Contributor

david-mcmahon commented Apr 18, 2016 •
edited
Loading

@thockin The current doc is correct. Post X.Y.0 we use the cherry_pick_pull.sh script.
What is not correct however is the bot adding release-note-label-needed to this cherrypick PR. @eparis, can you take a look?

@jsafrane, unless you are on the single ACL that github provides you are unable to add labels. We're looking for solutions if you have any suggestions.

@eparis eparis added this to the v1.2 milestone Apr 18, 2016
@eparis eparis assigned roberthbailey and unassigned thockin Apr 18, 2016
@eparis eparis added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Apr 18, 2016
@eparis
Copy link
Contributor

eparis commented Apr 18, 2016

assigning to @roberthbailey he is responsible for 1.2.
@jsafrane please re-open

@david-mcmahon I guess the bot could add release-note-note if the parent has the release note. And add release-note-label-needed if we cannot determine a parent....

@thockin
Copy link
Member

thockin commented Apr 18, 2016

I'm confused - the doc says just to label the original PR, which is labelled.

@eparis
Copy link
Contributor

eparis commented Apr 18, 2016

That's correct, hopefully no labeling needs done here. After the parent gets cherrypick-approved (should come from @roberthbailey ) this PR should automatically get cherrypick-approved

@david-mcmahon
Copy link
Contributor

david-mcmahon commented Apr 18, 2016 •
edited
Loading

@thockin that's correct process. We're trying to figure out why the bot is doing something different.
@eparis, right, release-note-label-needed should only appear if this is a non-cherry-pick (parent unavailable).

@roberthbailey roberthbailey reopened this Apr 18, 2016
@roberthbailey roberthbailey added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Apr 18, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 18, 2016

GCE e2e build/test passed for commit 60b117b.

@zmerlynn
Copy link
Member

@k8s-bot unit test this, issue #IGNORE (release branch)

@k8s-bot
Copy link

k8s-bot commented Apr 20, 2016

GCE e2e build/test passed for commit 60b117b.

@zmerlynn zmerlynn merged commit 4ba676d into kubernetes:release-1.2 Apr 20, 2016
@jsafrane jsafrane deleted the automated-cherry-pick-of-#23435-upstream-release-1.2 branch August 19, 2016 11:09
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#24244 from jsafrane/automated-cherry-pi…
54fb844 
…ck-of-#23435-upstream-release-1.2

Automated cherry pick of kubernetes#23435
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#24244 from jsafrane/automated-cherry-pi…
aa9a803 
…ck-of-#23435-upstream-release-1.2

Automated cherry pick of kubernetes#23435
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Dec 4, 2019
@k8s-publishing-bot
Merge pull request kubernetes#24244 from jsafrane/aws-attach-consistency
c5c7517 
Bug 1772189: UPSTREAM: 85675: Fix AWS eventual consistency of AttachDisk

Origin-commit: 7cca2dff0afb93a8a648adbccbbe95acba95eb18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.