Merge pull request #67011 from charrywanganthony/default_admissionPlugins_doc

Automatic merge from submit-queue (batch tested with PRs 65297, 67179, 67116, 67011, 66842). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. list the default enabled admission plugins **Which issue(s) this PR fixes** : Fixes #66979 **Release note**: ```release-note NONE ```

Merge pull request #67011 from charrywanganthony/default_admissionPlugins_doc
d04d7b4d · Kubernetes Submit Queue · GitHub · 44d6de79 · ee96a563 · d04d7b4d
Unverified Commit d04d7b4d authored Aug 09, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

admission.go staging/src/k8s.io/apiserver/pkg/server/options/admission.go +16 -2

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go
@@ -93,11 +93,13 @@ func (a *AdmissionOptions) AddFlags(fs *pflag.FlagSet) {
 	}

 	fs.StringSliceVar(&a.EnablePlugins, "enable-admission-plugins", a.EnablePlugins, ""+
-		"admission plugins that should be enabled in addition to default enabled ones. "+
+		"admission plugins that should be enabled in addition to default enabled ones ("+
+		strings.Join(a.defaultEnabledPluginNames(), ", ")+"). "+
 		"Comma-delimited list of admission plugins: "+strings.Join(a.Plugins.Registered(), ", ")+". "+
 		"The order of plugins in this flag does not matter.")
 	fs.StringSliceVar(&a.DisablePlugins, "disable-admission-plugins", a.DisablePlugins, ""+
-		"admission plugins that should be disabled although they are in the default enabled plugins list. "+
+		"admission plugins that should be disabled although they are in the default enabled plugins list ("+
+		strings.Join(a.defaultEnabledPluginNames(), ", ")+"). "+
 		"Comma-delimited list of admission plugins: "+strings.Join(a.Plugins.Registered(), ", ")+". "+
 		"The order of plugins in this flag does not matter.")
 	fs.StringVar(&a.ConfigFile, "admission-control-config-file", a.ConfigFile,
@@ -218,3 +220,15 @@ func (a *AdmissionOptions) enabledPluginNames() []string {

 	return orderedPlugins
 }
+
+//Return names of plugins which are enabled by default
+func (a *AdmissionOptions) defaultEnabledPluginNames() []string {
+	defaultOnPluginNames := []string{}
+	for _, pluginName := range a.RecommendedPluginOrder {
+		if !a.DefaultOffPlugins.Has(pluginName) {
+			defaultOnPluginNames = append(defaultOnPluginNames, pluginName)
+		}
+	}
+
+	return defaultOnPluginNames
+}