Skip to content

Commit 1288106

Browse files
author
k8s-merge-robot
committed
Merge pull request kubernetes#26676 from nikhiljindal/admissionControl
Automatic merge from submit-queue federation: Update the list of supported admission controls Ref kubernetes#26298 (comment) In 1.3, we are going to support only AlwaysAdmit and AlwaysDeny admission controls. Updating the documentation accordingly. @kubernetes/sig-cluster-federation
2 parents b8f3095 + fe3cba9 commit 1288106

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

docs/admin/federation-apiserver.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ federation-apiserver
4646
### Options
4747

4848
```
49-
--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
49+
--admission-control="AlwaysAdmit": Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: AlwaysAdmit, AlwaysDeny
5050
--admission-control-config-file="": File with admission control configuration.
5151
--advertise-address=<nil>: 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.
5252
--apiserver-count=1: The number of apiservers running in the cluster
@@ -103,7 +103,7 @@ federation-apiserver
103103
--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.
104104
```
105105

106-
###### Auto generated by spf13/cobra on 31-May-2016
106+
###### Auto generated by spf13/cobra on 1-Jun-2016
107107

108108

109109
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

federation/cmd/federation-apiserver/app/plugins.go

-11
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,5 @@ import (
2525

2626
// Admission policies
2727
_ "k8s.io/kubernetes/plugin/pkg/admission/admit"
28-
_ "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages"
2928
_ "k8s.io/kubernetes/plugin/pkg/admission/deny"
30-
_ "k8s.io/kubernetes/plugin/pkg/admission/exec"
31-
_ "k8s.io/kubernetes/plugin/pkg/admission/initialresources"
32-
_ "k8s.io/kubernetes/plugin/pkg/admission/limitranger"
33-
_ "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision"
34-
_ "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists"
35-
_ "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle"
36-
_ "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label"
37-
_ "k8s.io/kubernetes/plugin/pkg/admission/resourcequota"
38-
_ "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny"
39-
_ "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
4029
)

0 commit comments

Comments
 (0)