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

Jump to bottom

Fix decoding of admission config file #58439

Merged
merged 2 commits into from Jan 18, 2018
Merged

Fix decoding of admission config file #58439

merged 2 commits into from Jan 18, 2018

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Jan 18, 2018 •
edited

Fixes #58426

1a552bb#diff-eb9532eb476083e1ab31da9dd6f83eceR41 attempted to use a locally constructed scheme, but the name scheme was shadowed by a function arg.

Attempts to run the apiserver with a structured plugin config file would fail to decode (since the passed scheme didn't know about the AdmissionConfiguration type), then fall back to treating the file as a legacy config, and silently continue without correct config

kube-apiserver: fixes loading of `--admission-control-config-file` containing AdmissionConfiguration apiserver.k8s.io/v1alpha1 config object

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 18, 2018
@liggitt liggitt mentioned this pull request Jan 18, 2018
Closed
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 18, 2018
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2018
@liggitt
Copy link
Member Author

liggitt commented Jan 18, 2018

/assign @sttts @deads2k

@liggitt liggitt mentioned this pull request Jan 18, 2018
Merged
@liggitt
Copy link
Member Author

liggitt commented Jan 18, 2018

cc @kubernetes/sig-api-machinery-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Jan 18, 2018
@deads2k
Copy link
Contributor

deads2k commented Jan 18, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, liggitt

Associated issue: #58426

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

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
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@liggitt
Copy link
Member Author

liggitt commented Jan 18, 2018

/retest

1 similar comment
@liggitt
Copy link
Member Author

liggitt commented Jan 18, 2018

/retest

@k8s-github-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 57868, 58284, 56370, 58400, 58439). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit c7526fb into kubernetes:master Jan 18, 2018
@jennybuckley
Copy link

@jennybuckley

sttts
sttts reviewed Jan 19, 2018
View reviewed changes
staging/src/k8s.io/apiserver/pkg/server/options/admission.go
@@ -125,7 +125,7 @@ func (a *AdmissionOptions) ApplyTo(
pluginNames = a.enabledPluginNames()
}

pluginsConfigProvider, err := admission.ReadAdmissionConfiguration(pluginNames, a.ConfigFile, scheme)
pluginsConfigProvider, err := admission.ReadAdmissionConfiguration(pluginNames, a.ConfigFile, configScheme)
Copy link
Contributor

Choose a reason for hiding this comment

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

thanks. Which brings us back to the observation that the testing of all of this is too weak.

Copy link
Contributor

Choose a reason for hiding this comment

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

@hzxuzhonghu if you have capacity. improving the test coverage here would be awesome!

Copy link
Member

Choose a reason for hiding this comment

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

I would like to.

@sttts
Copy link
Contributor

sttts commented Jan 19, 2018

@liggitt we need a cherry-pick in origin, if you haven't done so yet.

@hzxuzhonghu hzxuzhonghu mentioned this pull request Jan 22, 2018
Closed
@liggitt liggitt deleted the admission-scheme branch January 26, 2018 04:57
k8s-github-robot pushed a commit that referenced this pull request Jan 27, 2018
Merge pull request #58441 from liggitt/admission-scheme-1.9
8b6f98a 
Automatic merge from submit-queue.

Cherrypick of #58439 #56408: Fix decoding of admission config file

Manual pick of #58439 and #56408 into release-1.9

```release-note
kube-apiserver: fixes loading of `--admission-control-config-file` containing AdmissionConfiguration apiserver.k8s.io/v1alpha1 config object
```
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

@hzxuzhonghu hzxuzhonghu hzxuzhonghu left review comments

Assignees

@sttts sttts

@mikedanese mikedanese

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

We have no way to simultaneously enable ImagePolicyWebhook and MutatingAdmissionWebhook admission plugins
8 participants
@liggitt @deads2k @k8s-ci-robot @k8s-github-robot @jennybuckley @sttts @hzxuzhonghu @mikedanese