Automated cherry pick of #28604 #29062 #29063
Conversation
k8s-github-robot
added
do-not-merge
bprashanth
force-pushed
the
automated-cherry-pick-of-#28604-#29062-upstream-release-1.3
branch
from
57d2f21 to
4dd5345
Compare
|
GCE e2e build/test passed for commit 4dd5345. |
|
any reason not to LGTM this now? |
bgrant0607
added
release-note
|
@bgrant0607 are you going to do the cherrypick? I labeled the two PRs as cherrypick-candidate and 1.3 milestone. |
|
@davidopp I was looking over the changes in this PR first. If we LGTM it, I believe it should be merged automatically. |
|
@bprashanth Were any conflicts resolved manually, or was this a straightforward patch? |
bgrant0607
removed
the
do-not-merge
|
This is a bigger change than we'd like, but I think we should go ahead with cherrypicking #28604, because I believe there will additional bugs we want to fix. LGTM |
bgrant0607
added
the
lgtm
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
There were some conflicts that I resolved manually (function args changed from 1.3 to HEAD, I kept the 1.3 version). I only cherrypicked the one pr I needed from this stack (#28832). I suppose things should fail if i picked wrong. |
|
GCE e2e build/test passed for commit 4dd5345. |
|
Automatic merge from submit-queue |
…pick-of-#28604-kubernetes#29062-upstream-release-1.3 Automatic merge from submit-queue Automated cherry pick of kubernetes#28604 kubernetes#29062 Cherry pick of kubernetes#28604 kubernetes#29062 on release-1.3.
Cherry pick of #28604 #29062 on release-1.3.