Merge pull request #20744 from sttts/sttts-enable-admission-webhooks

admission: enable webhooks by default

Author: openshift-merge-robot

pkg/cmd/server/origin/admission/chain_builder.go

@@ -11,15 +11,17 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
+	mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating"
+	validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating"
 	"k8s.io/apiserver/pkg/apis/apiserver"
-	noderestriction "k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
+	"k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
 	expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/resize"
 	storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storage/storageclass/setdefault"
 
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
-	imagepolicy "github.com/openshift/origin/pkg/image/apiserver/admission/apis/imagepolicy"
+	"github.com/openshift/origin/pkg/image/apiserver/admission/apis/imagepolicy"
 	imageadmission "github.com/openshift/origin/pkg/image/apiserver/admission/limitrange"
 	ingressadmission "github.com/openshift/origin/pkg/network/apiserver/admission"
 	overrideapi "github.com/openshift/origin/pkg/quota/apiserver/admission/apis/clusterresourceoverride"
@@ -99,8 +101,8 @@ var (
 		"DefaultTolerationSeconds",
 		"StorageObjectInUseProtection",
 		"Initializers",
-		"MutatingAdmissionWebhook",
-		"ValidatingAdmissionWebhook",
+		mutatingwebhook.PluginName,
+		validatingwebhook.PluginName,
 		"PodTolerationRestriction",
 		"AlwaysDeny",
 		// NOTE: ResourceQuota and ClusterResourceQuota must be the last 2 plugins.
@@ -155,8 +157,8 @@ var (
 		"DefaultTolerationSeconds",
 		"StorageObjectInUseProtection",
 		"Initializers",
-		"MutatingAdmissionWebhook",
-		"ValidatingAdmissionWebhook",
+		mutatingwebhook.PluginName,
+		validatingwebhook.PluginName,
 		"PodTolerationRestriction",
 		"AlwaysDeny",
 		// NOTE: ResourceQuota and ClusterResourceQuota must be the last 2 plugins.

pkg/cmd/server/origin/admission/register.go

@@ -15,7 +15,7 @@ import (
 	buildjenkinsbootstrapper "github.com/openshift/origin/pkg/build/apiserver/admission/jenkinsbootstrapper"
 	buildsecretinjector "github.com/openshift/origin/pkg/build/apiserver/admission/secretinjector"
 	buildstrategyrestrictions "github.com/openshift/origin/pkg/build/apiserver/admission/strategyrestrictions"
-	imagepolicy "github.com/openshift/origin/pkg/image/apiserver/admission/imagepolicy"
+	"github.com/openshift/origin/pkg/image/apiserver/admission/imagepolicy"
 	imageadmission "github.com/openshift/origin/pkg/image/apiserver/admission/limitrange"
 	ingressadmission "github.com/openshift/origin/pkg/network/apiserver/admission"
 	projectnodeenv "github.com/openshift/origin/pkg/project/apiserver/admission/nodeenv"
@@ -25,6 +25,8 @@ import (
 	quotarunonceduration "github.com/openshift/origin/pkg/quota/apiserver/admission/runonceduration"
 	schedulerpodnodeconstraints "github.com/openshift/origin/pkg/scheduler/admission/podnodeconstraints"
 	securityadmission "github.com/openshift/origin/pkg/security/apiserver/admission/sccadmission"
+	mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating"
+	validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating"
 
 	"k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
 	expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/resize"
@@ -99,6 +101,8 @@ var (
 		"ResourceQuota",
 		"openshift.io/ClusterResourceQuota",
 		"openshift.io/IngressAdmission",
+		mutatingwebhook.PluginName,
+		validatingwebhook.PluginName,
 	)
 
 	// DefaultOffPlugins includes plugins which require explicit configuration to run
@@ -118,8 +122,6 @@ var (
 		"EventRateLimit",
 		"PodSecurityPolicy",
 		"Initializers",
-		"ValidatingAdmissionWebhook",
-		"MutatingAdmissionWebhook",
 		"ExtendedResourceToleration",
 		expandpvcadmission.PluginName,