Skip to content

Make apply use the correct versioned obj #39396

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
Merged
merged 1 commit into from
Jan 5, 2017
Merged

Make apply use the correct versioned obj #39396

merged 1 commit into from
Jan 5, 2017

Conversation

mengqiy
Copy link
Member

@mengqiy mengqiy commented Jan 4, 2017

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 4, 2017
@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 Jan 4, 2017
@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 261cdcc. 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.

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.

@pwittrock pwittrock assigned liggitt and unassigned smarterclayton Jan 4, 2017
@pwittrock
Copy link
Member

@liggitt Assigned to you since you reviewed the patch for 1.5

@liggitt
Copy link
Member

liggitt commented Jan 4, 2017

can you pick the 2016 -> 2017 fix as well so we can get a green test run on this?

@liggitt
Copy link
Member

liggitt commented Jan 4, 2017

@k8s-bot gci gke e2e test this

@jessfraz jessfraz added this to the v1.4 milestone Jan 4, 2017
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Jan 4, 2017
@jessfraz jessfraz self-assigned this Jan 4, 2017
@liggitt
Copy link
Member

liggitt commented Jan 4, 2017

pick LGTM

@jessfraz
Copy link
Contributor

jessfraz commented Jan 4, 2017

sweet ill just let #39437 get in then merge this one :)

@jessfraz jessfraz added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 4, 2017
@k8s-github-robot k8s-github-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 4, 2017
@mengqiy
Copy link
Member Author

mengqiy commented Jan 4, 2017

I need to drop the 2nd commit after #39437 merged.

@liggitt
Copy link
Member

liggitt commented Jan 4, 2017 •
edited
Loading

@ymqytw you can go ahead and drop the year regen commit... @jessfraz will rerun tests on this one after #39437 merged... sorry for the mixup

@mengqiy mengqiy force-pushed the apply_versioned_obj branch from f40bcc7 to 261cdcc Compare January 4, 2017 19:34
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 4, 2017
@mengqiy
Copy link
Member Author

mengqiy commented Jan 4, 2017

@liggitt Done.

@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 261cdcc. Full PR test history.

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

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.

@jessfraz
Copy link
Contributor

jessfraz commented Jan 4, 2017

@k8s-bot verify test this please

@mengqiy
Copy link
Member Author

mengqiy commented Jan 4, 2017

#39437 has been merged.
@k8s-bot test this

@jessfraz
Copy link
Contributor

jessfraz commented Jan 5, 2017

@k8s-bot node e2e test this

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit 261cdcc. Full PR test history.

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

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.

@jessfraz
Copy link
Contributor

jessfraz commented Jan 5, 2017

that is failing because of a flake so merging because all others green

@jessfraz jessfraz merged commit 9b24791 into kubernetes:release-1.4 Jan 5, 2017
@k8s-cherrypick-bot
Copy link

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

@mengqiy mengqiy deleted the apply_versioned_obj branch January 5, 2017 01:47
This was referenced Jan 13, 2017
Closed
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

@jessfraz jessfraz

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-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
9 participants
@mengqiy @k8s-reviewable @k8s-ci-robot @pwittrock @liggitt @jessfraz @k8s-cherrypick-bot @smarterclayton @k8s-github-robot