Merge pull request #18146 from gnufied/fix-resize-admission-config

Automatic merge from submit-queue.

Add resize plugin to admission list

Without this - it isn't possible to enable this plugin.

Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1531513 
Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1532149

Author: openshift-merge-robot

Diff for: pkg/cmd/server/origin/admission/chain_builder.go

@@ -13,6 +13,7 @@ import (
 	admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
 	noderestriction "k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
+	expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
 	saadmit "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
 	storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
 
@@ -65,6 +66,7 @@ var (
 		noderestriction.PluginName,
 		sccadmission.PluginName,
 		storageclassdefaultadmission.PluginName,
+		expandpvcadmission.PluginName,
 		"AlwaysPullImages",
 		"LimitPodHardAntiAffinityTopology",
 		"SCCExecRestrictions",
@@ -112,6 +114,7 @@ var (
 		noderestriction.PluginName,
 		sccadmission.PluginName,
 		storageclassdefaultadmission.PluginName,
+		expandpvcadmission.PluginName,
 		"AlwaysPullImages",
 		"LimitPodHardAntiAffinityTopology",
 		"SCCExecRestrictions",

Diff for: pkg/cmd/server/origin/admission/config_test.go

@@ -13,6 +13,7 @@ import (
 	overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
 	sccadmission "github.com/openshift/origin/pkg/security/admission"
 	serviceadmit "github.com/openshift/origin/pkg/service/admission"
+	expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
 )
 
 // TestAdmissionPluginChains makes sure that the admission plugin lists are coherent.
@@ -95,6 +96,7 @@ var usedKubeAdmissionPlugins = sets.NewString(
 	"ExtendedResourceToleration",
 	"PVCProtection",
 	"NodeRestriction",
+	expandpvcadmission.PluginName,
 )
 
 // TestAdmissionPluginNames makes sure that openshift admission plugins are prefixed with `openshift.io/`.

Diff for: pkg/cmd/server/origin/admission/register.go

@@ -30,6 +30,7 @@ import (
 	serviceadmit "github.com/openshift/origin/pkg/service/admission"
 
 	"k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
+	expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
 	storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
 
 	imagepolicyapi "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
@@ -121,6 +122,7 @@ var (
 		"PodTolerationRestriction",
 		"ExtendedResourceToleration",
 		"PVCProtection",
+		expandpvcadmission.PluginName,
 	)
 )