Skip to content

Commit e83e8e6

Browse files
author
Avesh Agarwal
committed
Include DefaultTolerationSeconds admission plugin but off by default.
1 parent 9063c2c commit e83e8e6

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

pkg/cmd/server/origin/admissionconfig_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ var kubeAdmissionPlugins = sets.NewString(
8585
"PersistentVolumeLabel",
8686
"OwnerReferencesPermissionEnforcement",
8787
"PodNodeSelector",
88+
"DefaultTolerationSeconds",
8889
)
8990

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

pkg/cmd/server/origin/master_config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ var (
391391
"PersistentVolumeLabel",
392392
"OwnerReferencesPermissionEnforcement",
393393
ingressadmission.IngressAdmission,
394+
"DefaultTolerationSeconds",
394395
// NOTE: quotaadmission and ClusterResourceQuota must be the last 2 plugins.
395396
// DO NOT ADD ANY PLUGINS AFTER THIS LINE!
396397
quotaadmission.PluginName,
@@ -429,6 +430,7 @@ var (
429430
"PersistentVolumeLabel",
430431
"OwnerReferencesPermissionEnforcement",
431432
ingressadmission.IngressAdmission,
433+
"DefaultTolerationSeconds",
432434
// NOTE: quotaadmission and ClusterResourceQuota must be the last 2 plugins.
433435
// DO NOT ADD ANY PLUGINS AFTER THIS LINE!
434436
quotaadmission.PluginName,

pkg/cmd/server/start/admission.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
_ "github.com/openshift/origin/pkg/security/admission"
3030
_ "k8s.io/kubernetes/plugin/pkg/admission/admit"
3131
_ "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages"
32+
_ "k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds"
3233
_ "k8s.io/kubernetes/plugin/pkg/admission/exec"
3334
_ "k8s.io/kubernetes/plugin/pkg/admission/limitranger"
3435
_ "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists"
@@ -87,6 +88,7 @@ var (
8788
"ImagePolicyWebhook",
8889
"openshift.io/RestrictSubjectBindings",
8990
"LimitPodHardAntiAffinityTopology",
91+
"DefaultTolerationSeconds",
9092
)
9193
)
9294

0 commit comments

Comments
 (0)