github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

admission: do not leak admission config types outside of the plugins

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-11-27 14:44:04 +01:00
parent 2476aa410b
commit 1a552bbe14
14 changed files with 119 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/pkg/admission/eventratelimit/admission.go
View File

@@ -23,7 +23,6 @@ import (
"k8s.io/client-go/util/flowcontrol"
api "k8s.io/kubernetes/pkg/apis/core"
eventratelimitapi "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit"
eventratelimitapiv1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1"
"k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit/validation"
)
@@ -44,10 +43,6 @@ func Register(plugins *admission.Plugins) {
}
return newEventRateLimit(configuration, realClock{})
})
// add our config types
eventratelimitapi.AddToScheme(plugins.ConfigScheme)
eventratelimitapiv1alpha1.AddToScheme(plugins.ConfigScheme)
}
// Plugin implements an admission controller that can enforce event rate limits

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

@@ -38,7 +38,6 @@ import (
"k8s.io/kubernetes/pkg/scheduler/algorithm"
"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"
)
// Register registers a plugin
@@ -50,9 +49,6 @@ 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

5
plugin/pkg/admission/resourcequota/admission.go
View File

@@ -28,7 +28,6 @@ import (
kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
"k8s.io/kubernetes/pkg/quota"
resourcequotaapi "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota"
resourcequotaapiv1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1"
"k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/validation"
)
@@ -49,10 +48,6 @@ func Register(plugins *admission.Plugins) {
}
return NewResourceQuota(configuration, 5, make(chan struct{}))
})
// add our config types
resourcequotaapi.AddToScheme(plugins.ConfigScheme)
resourcequotaapiv1alpha1.AddToScheme(plugins.ConfigScheme)
}
// QuotaAdmission implements an admission controller that can enforce quota constraints