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

Manual cherrypick of kube-openapi changes for release-1.9 #63626

Merged
merged 2 commits into from May 10, 2018

Conversation

roycaihw
Copy link
Member

@roycaihw roycaihw commented May 9, 2018

What this PR does / why we need it:
Cherry-picks kubernetes/kube-openapi#64 and kubernetes/kube-openapi#67
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec (with empty Paths/Definitions)

Release note:

Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec

/cc @mbohlool
/sig api-machinery

bump Godep against kube-openapi/release-1.9 branch
@k8s-ci-robot k8s-ci-robot requested a review from mbohlool May 9, 2018 22:51
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels May 9, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label May 9, 2018
@mbohlool
Copy link
Contributor

mbohlool commented May 9, 2018

/lgtm /approval

@mbohlool mbohlool 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/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels May 9, 2018
@lavalamp
Copy link
Member

lavalamp commented May 9, 2018

Why is this manual an not an automated CP of something already in master?

@lavalamp
Copy link
Member

/approve

I'll assume there's a good reason for this and approve so I don't hold up the works :)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lavalamp, mbohlool, roycaihw

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2018
@roycaihw
Copy link
Member Author

@lavalamp

Because it's a CP of changes in vendor directory. We don't want to bump the Godep version in this release branch to be the same as master, which would include every change in kube-openapi up-to-date. Instead we create a new branch in kube-openapi (https://github.com/kubernetes/kube-openapi/tree/release-1.9) which only include the two commits we need, and CP that Godep version.

@mbohlool mbohlool added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2018
@mbohlool mbohlool self-assigned this May 10, 2018
@k8s-github-robot
Copy link

/test all [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 8d48604 into kubernetes:release-1.9 May 10, 2018
@lavalamp
Copy link
Member

lavalamp commented May 10, 2018 via email

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 Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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

5 participants