Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable pod preset admission, but default to off #14461

Merged
merged 1 commit into from
Jun 10, 2017
Merged

Enable pod preset admission, but default to off #14461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/cmd/server/origin/admissionconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ var legacyOpenshiftAdmissionPlugins = sets.NewString(
// kubeAdmissionPlugins tracks kube plugins we use. You may add to this list, but ONLY if they're from upstream kube
var kubeAdmissionPlugins = sets.NewString(
lifecycle.PluginName,
"PodPreset",
"LimitRanger",
"ServiceAccount",
"DefaultStorageClass",
Expand Down
2 changes: 2 additions & 0 deletions pkg/cmd/server/origin/master_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ var (
serviceadmit.RestrictedEndpointsPluginName,
imagepolicy.PluginName,
"ImagePolicyWebhook",
"PodPreset",
"LimitRanger",
"ServiceAccount",
"SecurityContextConstraint",
Expand Down Expand Up @@ -439,6 +440,7 @@ var (
serviceadmit.RestrictedEndpointsPluginName,
imagepolicy.PluginName,
"ImagePolicyWebhook",
"PodPreset",
"LimitRanger",
"ServiceAccount",
"SecurityContextConstraint",
Expand Down
2 changes: 2 additions & 0 deletions pkg/cmd/server/start/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
_ "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle"
_ "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label"
_ "k8s.io/kubernetes/plugin/pkg/admission/podnodeselector"
_ "k8s.io/kubernetes/plugin/pkg/admission/podpreset"
_ "k8s.io/kubernetes/plugin/pkg/admission/resourcequota"
_ "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"

Expand Down Expand Up @@ -87,6 +88,7 @@ var (
"openshift.io/RestrictSubjectBindings",
"LimitPodHardAntiAffinityTopology",
"DefaultTolerationSeconds",
"PodPreset", // default to off while PodPreset is alpha
)
)

Expand Down