Merge pull request #32181 from smarterclayton/stable_flags

Automatic merge from submit-queue Feature gate is not stable sorted - docs change each gen Also... why are the feature flags defined *in* pkg/util/config which has nothing to do with general Kube? Flags should be defined statically in a subpackage of the kubelet (if they are kubelet feature flags) or in pkg/kubernetes/features or something somewhere else generic.

Merge pull request #32181 from smarterclayton/stable_flags
c6919a01 · Kubernetes Submit Queue · GitHub · 23147d30 · 4189062a · c6919a01
Commit c6919a01 authored Sep 07, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

feature_gate.go pkg/util/config/feature_gate.go +1 -0

No files found.
--- a/pkg/util/config/feature_gate.go
+++ b/pkg/util/config/feature_gate.go
@@ -216,6 +216,7 @@ func (f *featureGate) AddFlag(fs *pflag.FlagSet) {
 		}
 		known = append(known, fmt.Sprintf("%s=true|false (%sdefault=%t)", k, pre, v.enabled))
 	}
+	sort.Strings(known)
 	fs.Var(f, flagName, ""+
 		"A set of key=value pairs that describe feature gates for alpha/experimental features. "+
 		"Options are:\n"+strings.Join(known, "\n"))