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

make apply use the correct versioned obj #38982

Merged
merged 1 commit into from
Dec 21, 2016
Merged

make apply use the correct versioned obj #38982

merged 1 commit into from
Dec 21, 2016

Conversation

mengqiy
Copy link
Member

@mengqiy mengqiy commented Dec 19, 2016 •
edited
Loading

Cherrypick part of the changes from #38406.
Make kubectl apply in v1.5 works for #34413.

Give apply the versioned struct that generated from the type defined in the restmapping.

cc: @pwittrock @matchstick @liggitt

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 19, 2016
@k8s-reviewable
Copy link

This change is Reviewable

@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Dec 19, 2016
@pwittrock pwittrock added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Dec 19, 2016
@pwittrock pwittrock assigned liggitt and unassigned brendandburns Dec 19, 2016
@pwittrock pwittrock added this to the v1.5 milestone Dec 19, 2016
@pwittrock pwittrock added cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Dec 19, 2016
@pwittrock
Copy link
Member

@soltysh FYI, it looks like #34413 may already be fixed on head

@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 Dec 19, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 69042fe. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@mengqiy
Copy link
Member Author

mengqiy commented Dec 19, 2016

@k8s-bot gci gke e2e test this

@mengqiy
Copy link
Member Author

mengqiy commented Dec 20, 2016

@liggitt This fixes a blocking issue in 1.5. PTAL. Thanks.

@liggitt
Copy link
Member

liggitt commented Dec 20, 2016

the pick LGTM, but what blocking bug is this fixing for 1.5?

@mengqiy
Copy link
Member Author

mengqiy commented Dec 20, 2016

@liggitt This fixes #34413 that blocks GKE users. They are pushing for this patch.

@liggitt liggitt added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 20, 2016
@liggitt
Copy link
Member

liggitt commented Dec 20, 2016 •
edited
Loading

were you able to reproduce #34413 consistently and verify this fixes it?

@mengqiy
Copy link
Member Author

mengqiy commented Dec 20, 2016

I can reproduce #34413. It happens Intermittently and the change is about 50%.
It doesn't happen any more on HEAD and 1.5 with the patch.

@mengqiy
Copy link
Member Author

mengqiy commented Dec 20, 2016

@saad-ali we need to cherrypick this in 1.5.

@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherrypick-candidate do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Dec 21, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c9ad0c1 into kubernetes:release-1.5 Dec 21, 2016
@mengqiy mengqiy deleted the make_apply_use_correct_versioned_obj branch December 21, 2016 18:03
@mengqiy mengqiy mentioned this pull request Jan 4, 2017
Merged
@munnerz munnerz mentioned this pull request Jan 4, 2017
Closed
This was referenced Jan 13, 2017
Closed
Closed
This was referenced Jan 18, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@liggitt liggitt

Labels
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 Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
8 participants
@mengqiy @k8s-reviewable @pwittrock @k8s-ci-robot @liggitt @k8s-github-robot @brendandburns @saad-ali