From 2d326345f2ab4085bf72d1c5893bbd2f9cd61f47 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 28 May 2019 10:45:02 -0700 Subject: [PATCH] add RuntimeClass admission controller plugin Signed-off-by: Eric Ernst --- pkg/kubeapiserver/options/plugins.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/kubeapiserver/options/plugins.go b/pkg/kubeapiserver/options/plugins.go index 99f7993f169..4be17191fb7 100644 --- a/pkg/kubeapiserver/options/plugins.go +++ b/pkg/kubeapiserver/options/plugins.go @@ -41,6 +41,7 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction" podpriority "k8s.io/kubernetes/plugin/pkg/admission/priority" "k8s.io/kubernetes/plugin/pkg/admission/resourcequota" + "k8s.io/kubernetes/plugin/pkg/admission/runtimeclass" "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy" "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny" "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" @@ -89,6 +90,7 @@ var AllOrderedPlugins = []string{ resize.PluginName, // PersistentVolumeClaimResize mutatingwebhook.PluginName, // MutatingAdmissionWebhook validatingwebhook.PluginName, // ValidatingAdmissionWebhook + runtimeclass.PluginName, //RuntimeClass resourcequota.PluginName, // ResourceQuota deny.PluginName, // AlwaysDeny } @@ -115,6 +117,7 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { podnodeselector.Register(plugins) podpreset.Register(plugins) podtolerationrestriction.Register(plugins) + runtimeclass.Register(plugins) resourcequota.Register(plugins) podsecuritypolicy.Register(plugins) podpriority.Register(plugins) @@ -148,5 +151,9 @@ func DefaultOffAdmissionPlugins() sets.String { defaultOnPlugins.Insert(nodetaint.PluginName) //TaintNodesByCondition } + if utilfeature.DefaultFeatureGate.Enabled(features.PodOverhead) { + defaultOnPlugins.Insert(runtimeclass.PluginName) //RuntimeClass + } + return sets.NewString(AllOrderedPlugins...).Difference(defaultOnPlugins) }