Skip to content

fix multi-version CRD + admission webhook #79495

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
k8s-ci-robot merged 1 commit into from
Aug 7, 2019
Merged

fix multi-version CRD + admission webhook #79495

k8s-ci-robot merged 1 commit into from
Aug 7, 2019

Conversation

@liggitt
Copy link
Member

@liggitt liggitt commented Jun 27, 2019 •
edited
Loading

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
xref #73752

Special notes for your reviewer:
This is a smaller workaround to address #73752 specifically for no-op schema conversion in CRDs (which is the only type of conversion supported in 1.13). Backporting the 1.14 fix in #74154 would change 100+ files and change the Admission interface signature

Does this PR introduce a user-facing change?:

Resolves a bug that prevented sending a multi-version custom resource to an admission webhook.

/cc @sttts @jpbetz

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 27, 2019

@liggitt: This PR is not for the master branch but does not have the cherry-pick-approved label. Adding the do-not-merge/cherry-pick-not-approved label.

To approve the cherry-pick, please ping the kubernetes/patch-release-team in a comment when ready.

See also Kuberentes Patch Releases

Details

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.

@k8s-ci-robot k8s-ci-robot requested review from jpbetz and sttts June 27, 2019 21:27
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. 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. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/testing Categorizes an issue or PR as relevant to SIG Testing. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 27, 2019
@liggitt liggitt force-pushed the crd-conversion-1.13 branch from 3e1b47b to 6331078 Compare June 27, 2019 21:52
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 27, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 27, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

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

The pull request process is described here

Details 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

@liggitt liggitt changed the title WIP - fix multi-version CRD + admission webhook fix multi-version CRD + admission webhook Jun 27, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 27, 2019
@liggitt
Copy link
Member Author

liggitt commented Jun 27, 2019

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 27, 2019
@liggitt liggitt added this to the v1.13 milestone Jun 27, 2019
@liggitt
Copy link
Member Author

liggitt commented Jun 27, 2019

also picked test fix 6b73b50 to address #76393 flake

@liggitt
Copy link
Member Author

liggitt commented Jun 27, 2019

/retest

@liggitt liggitt force-pushed the crd-conversion-1.13 branch 2 times, most recently from 77ec232 to b0e2952 Compare June 28, 2019 21:06
@liggitt
Copy link
Member Author

liggitt commented Jun 29, 2019

/retest

@yliaog
Copy link
Contributor

yliaog commented Jul 1, 2019

/cc @roycaihw

@k8s-ci-robot k8s-ci-robot requested a review from roycaihw July 1, 2019 21:08
@slintes slintes mentioned this pull request Jul 3, 2019
Merged
@davidvossel
Copy link

davidvossel commented Jul 8, 2019

Is there anything blocking this from being merged?

sttts
sttts reviewed Jul 8, 2019
View reviewed changes
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/conversion.go Outdated
Copy link
Contributor

@sttts sttts Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment why we do this hack. Otherwise lgtm.

@sttts
Copy link
Contributor

sttts commented Jul 8, 2019

lgtm.

Feel free to self-tag after the comment is added.

@liggitt liggitt force-pushed the crd-conversion-1.13 branch from b0e2952 to 4346919 Compare July 8, 2019 15:09
@liggitt
Copy link
Member Author

liggitt commented Jul 8, 2019

added comment, tagging

@liggitt liggitt added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2019
@liggitt liggitt mentioned this pull request Jul 23, 2019
Closed
@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 6, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Aug 6, 2019
@fejta-bot
Copy link

fejta-bot commented Aug 7, 2019

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit d1c41b5 into kubernetes:release-1.13 Aug 7, 2019
markusthoemmes added a commit to markusthoemmes/origin that referenced this pull request Aug 7, 2019
@markusthoemmes
Fix multi-version CRD + admission webhook
7e77db9 
Cherry-picked from: kubernetes/kubernetes#79495
@markusthoemmes markusthoemmes mentioned this pull request Aug 9, 2019
Merged
@liggitt liggitt deleted the crd-conversion-1.13 branch August 19, 2019 13:43
markusthoemmes added a commit to markusthoemmes/kubernetes that referenced this pull request Aug 20, 2019
@markusthoemmes
Fix multi-version CRD + admission webhook
4abc36b 
Cherry picking changes needed to backport a fix that was originally backported into 1.13 in kubernetes#79495.
@markusthoemmes markusthoemmes mentioned this pull request Aug 20, 2019
Closed
markusthoemmes added a commit to markusthoemmes/kubernetes that referenced this pull request Aug 20, 2019
@markusthoemmes
Fix multi-version CRD + admission webhook
d713928 
Cherry picking changes needed to backport a fix that was originally backported into 1.13 in kubernetes#79495.
@markusthoemmes markusthoemmes mentioned this pull request Aug 20, 2019
Closed
@barkbay barkbay mentioned this pull request Dec 31, 2019
Closed
@davidvossel davidvossel mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sttts sttts sttts left review comments

@jpbetz jpbetz Awaiting requested review from jpbetz

@roycaihw roycaihw Awaiting requested review from roycaihw

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

v1.13

Development

Successfully merging this pull request may close these issues.

7 participants

@liggitt @k8s-ci-robot @yliaog @davidvossel @sttts @fejta-bot @tpepper