Automated cherry pick of #23500 #23707
Conversation
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
|
@tam7t asking on googlebots behest (#23707 (comment)), are you ok with cherrypicking your fix to the 1.2 branch? |
|
@k8s-bot unit test this issue: #IGNORE |
|
LGTM |
bgrant0607
added
the
lgtm
|
@bprashanth We don't ask for individual permission to copy commits from master to release branches. I'm going to human-approve the CLA. |
|
This PR is not for the master branch but does not have the |
k8s-github-robot
added
the
do-not-merge
|
Labelling this PR as size/L |
k8s-github-robot
added
kind/api-change
|
GCE e2e build/test passed for commit b92de3d6e5918451c76a8c9016ba08a32a520f18. |
|
@k8s-bot unit test this issue: #IGNORE |
|
Unit tests fail. PTAL, but this won't make 1.2.1 at this point. |
bgrant0607
removed
the
lgtm
|
Got distracted debugging something else. unittests failed because I need to update api ref docs but running update-api-reference.sh (both on master+cherrypick and upstream/release-1.2) didn't fix anything locally, so digging into the script now. |
bprashanth
force-pushed
the
automated-cherry-pick-of-#23500-upstream-release-1.2
branch
from
b92de3d to
842948e
Compare
k8s-github-robot
added
cherry-pick-approved
|
Labelling this PR as size/M |
k8s-github-robot
added
size/M
|
GCE e2e build/test passed for commit 842948e. |
|
@caesarxuchao I think there's something fishy with the update scripts. I ran it against both master + this cherrypick and upstream/release-1.2, it finished successfully, but the "verify-api-ref" script failed. Eventually I ran "verify-api-reference-docs.sh" with the rm line commented out, and copied the files from _tmp over the real ones. This got tests to pass. Maybe bug? |
|
@bgrant0607 PTAL so we can get this in the next minor release |
|
Thanks @bprashanth. All green. Merging. |
bgrant0607
added
the
lgtm
| @@ -36,7 +36,7 @@ TMP_ROOT="${KUBE_ROOT}/_tmp" | |||
| echo "diffing ${API_REFERENCE_DOCS_ROOT} against freshly generated docs" | |||
| ret=0 | |||
| diff -NauprB -I 'Last update' --exclude=*.md "${API_REFERENCE_DOCS_ROOT}" "${OUTPUT_DIR}" || ret=$? | |||
| rm -rf "${TMP_ROOT}" | |||
| # rm -rf "${TMP_ROOT}" | |||
There was a problem hiding this comment.
I'll add this line back.
I couldn't quickly figure out why the verification failed. I'll help debug when this happens again.
There was a problem hiding this comment.
Ack. didn't mean to comment it out. I assume you're adding it back, let me know if you want me to instead.
…pick-of-#23500-upstream-release-1.2 Automated cherry pick of kubernetes#23500
…pick-of-#23500-upstream-release-1.2 Automated cherry pick of kubernetes#23500
Cherry pick of #23500 on release-1.2.