Skip to content

Commit 3c3a358

Browse files
committed
Add resize plugin to admission list
Fix unit tests
1 parent 78ddc10 commit 3c3a358

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
1414
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
1515
noderestriction "k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
16+
expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
1617
saadmit "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
1718
storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
1819

@@ -63,6 +64,7 @@ var (
6364
noderestriction.PluginName,
6465
sccadmission.PluginName,
6566
storageclassdefaultadmission.PluginName,
67+
expandpvcadmission.PluginName,
6668
"AlwaysPullImages",
6769
"LimitPodHardAntiAffinityTopology",
6870
"SCCExecRestrictions",
@@ -109,6 +111,7 @@ var (
109111
noderestriction.PluginName,
110112
sccadmission.PluginName,
111113
storageclassdefaultadmission.PluginName,
114+
expandpvcadmission.PluginName,
112115
"AlwaysPullImages",
113116
"LimitPodHardAntiAffinityTopology",
114117
"SCCExecRestrictions",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
1414
sccadmission "github.com/openshift/origin/pkg/security/admission"
1515
serviceadmit "github.com/openshift/origin/pkg/service/admission"
16+
expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
1617
)
1718

1819
// TestAdmissionPluginChains makes sure that the admission plugin lists are coherent.
@@ -95,6 +96,7 @@ var usedKubeAdmissionPlugins = sets.NewString(
9596
"ExtendedResourceToleration",
9697
"PVCProtection",
9798
"NodeRestriction",
99+
expandpvcadmission.PluginName,
98100
)
99101

100102
// TestAdmissionPluginNames makes sure that openshift admission plugins are prefixed with `openshift.io/`.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
serviceadmit "github.com/openshift/origin/pkg/service/admission"
3030

3131
"k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
32+
expandpvcadmission "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize"
3233
storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
3334

3435
imagepolicyapi "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
@@ -117,6 +118,7 @@ var (
117118
"PodTolerationRestriction",
118119
"ExtendedResourceToleration",
119120
"PVCProtection",
121+
expandpvcadmission.PluginName,
120122
)
121123
)
122124

0 commit comments

Comments
 (0)