From fe3cba94bf4eed7bd7095293443ab60f8301ca66 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Wed, 1 Jun 2016 18:51:09 -0700 Subject: [PATCH] Update the list of supported admission controls --- docs/admin/federation-apiserver.md | 4 ++-- federation/cmd/federation-apiserver/app/plugins.go | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/docs/admin/federation-apiserver.md b/docs/admin/federation-apiserver.md index 80d4014d2c2..b8999a39c76 100644 --- a/docs/admin/federation-apiserver.md +++ b/docs/admin/federation-apiserver.md @@ -46,7 +46,7 @@ federation-apiserver ### Options ``` - --admission-control="AlwaysAdmit": Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, DenyEscalatingExec, DenyExecOnPrivileged, InitialResources, LimitRanger, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, PersistentVolumeLabel, ResourceQuota, SecurityContextDeny, ServiceAccount + --admission-control="AlwaysAdmit": Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: AlwaysAdmit, AlwaysDeny --admission-control-config-file="": File with admission control configuration. --advertise-address=: The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used. --apiserver-count=1: The number of apiservers running in the cluster @@ -103,7 +103,7 @@ federation-apiserver --watch-cache-sizes=[]: List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource#size, where size is a number. It takes effect when watch-cache is enabled. ``` -###### Auto generated by spf13/cobra on 31-May-2016 +###### Auto generated by spf13/cobra on 1-Jun-2016 diff --git a/federation/cmd/federation-apiserver/app/plugins.go b/federation/cmd/federation-apiserver/app/plugins.go index f4742fc46ae..d8ff1d8a888 100644 --- a/federation/cmd/federation-apiserver/app/plugins.go +++ b/federation/cmd/federation-apiserver/app/plugins.go @@ -25,16 +25,5 @@ import ( // Admission policies _ "k8s.io/kubernetes/plugin/pkg/admission/admit" - _ "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages" _ "k8s.io/kubernetes/plugin/pkg/admission/deny" - _ "k8s.io/kubernetes/plugin/pkg/admission/exec" - _ "k8s.io/kubernetes/plugin/pkg/admission/initialresources" - _ "k8s.io/kubernetes/plugin/pkg/admission/limitranger" - _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision" - _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists" - _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle" - _ "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label" - _ "k8s.io/kubernetes/plugin/pkg/admission/resourcequota" - _ "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny" - _ "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" )