github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57523 from jennybuckley/podtolerationrestriction-config

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 57651, 56411, 56779, 57523, 57624). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

add podtolerationrestriction config to scheme

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
fixes #57522

Related to #57513
This commit is contained in:
Kubernetes Submit Queue 2018-01-02 14:09:48 -08:00 committed by GitHub
commit 014676fc4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/podtolerationrestriction/admission.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/kubeapiserver/admission/util"
"k8s.io/kubernetes/pkg/util/tolerations"
pluginapi "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction"
pluginapiv1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
)
@ -49,6 +50,9 @@ func Register(plugins *admission.Plugins) {
}
return NewPodTolerationsPlugin(pluginConfig), nil
})
// add our config types
pluginapi.AddToScheme(plugins.ConfigScheme)
pluginapiv1alpha1.AddToScheme(plugins.ConfigScheme)
}
// The annotation keys for default and whitelist of tolerations