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

Automated cherry pick of #38330 #43190

Conversation

zhouhaibing089
Copy link
Contributor

Cherry pick of #38330 on release-1.5.

#38330: let DirectEncoder take a hint of what gvk to set during its

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Hi @zhouhaibing089. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 16, 2017
@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 16, 2017
@caesarxuchao
Copy link
Member

@k8s-bot ok to test

@caesarxuchao caesarxuchao self-assigned this Mar 17, 2017
@caesarxuchao
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 17, 2017
@caesarxuchao
Copy link
Member

@mwielgus could you approve the cherry-pick?

@caesarxuchao caesarxuchao added release-note-none Denotes a PR that doesn't merit a release note. cherrypick-candidate and removed release-note-label-needed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 17, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 17, 2017
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@caesarxuchao
Copy link
Member

@k8s-bot unit test this

@caesarxuchao caesarxuchao added cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 20, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 20, 2017
@caesarxuchao caesarxuchao added this to the v1.5 milestone Mar 20, 2017
@zhouhaibing089
Copy link
Contributor Author

UT build failed.. need some change..

@zhouhaibing089 zhouhaibing089 force-pushed the automated-cherry-pick-of-#38330-upstream-release-1.5 branch from fdc99de to 3e7475d Compare March 21, 2017 02:29
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 21, 2017
@caesarxuchao
Copy link
Member

@zhouhaibing089 can you highlight what did you change?

@zhouhaibing089
Copy link
Contributor Author

@caesarxuchao the change I made: schema.GroupVersionKind => unversioned.GroupVersionKind.

@caesarxuchao
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 22, 2017
@caesarxuchao
Copy link
Member

@mwielgus could you approve the cherrypick? Thanks.

@mwielgus mwielgus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 24, 2017
@mwielgus
Copy link
Contributor

cherrypick approved.
You need to get a regular approval for it to merge.

@zhouhaibing089
Copy link
Contributor Author

cc @lavalamp could you approve?

@liggitt
Copy link
Member

liggitt commented Mar 27, 2017

Is this needed for anything other than kubeadm? We won't release an update to kubeadm off the 1.5 stream

@zhouhaibing089
Copy link
Contributor Author

@liggitt it also resolves the objection deletion in federation..

@lavalamp
Copy link
Member

lavalamp commented Apr 4, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, lavalamp, zhouhaibing089

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 4, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 8ab26d5 into kubernetes:release-1.5 Apr 4, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@zhouhaibing089 zhouhaibing089 deleted the automated-cherry-pick-of-#38330-upstream-release-1.5 branch August 22, 2017 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants