Merge pull request #42786 from gyliu513/feature-gates

Automatic merge from submit-queue (batch tested with PRs 42786, 42553) Updated comments for TaintBasedEvictions. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**:

Merge pull request #42786 from gyliu513/feature-gates
1a3c3be5 · Kubernetes Submit Queue · GitHub · cf732613 · ed28695d · 1a3c3be5
Commit 1a3c3be5 authored Mar 09, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

known-flags.txt hack/verify-flags/known-flags.txt +0 -2

well_known_labels.go ...k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go +2 -2

No files found.
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -680,11 +680,9 @@ upgrade-target
 use-kubernetes-cluster-service
 use-kubernetes-version
 use-service-account-credentials
-use-taint-based-evictions
 user-whitelist
 use-service-account-credentials
 use-service-account-credentials
-use-taint-based-evictions
 verb
 verify-only
 versioned-clientset-package

--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go
@@ -34,12 +34,12 @@ const (
 	// fluentd in not running as a manifest pod with LabelFluentdDsReady.
 	LabelFluentdDsReady = "alpha.kubernetes.io/fluentd-ds-ready"

-	// When the --use-taint-based-evictions flag is enabled,
+	// When feature-gate for TaintBasedEvictions=true flag is enabled,
 	// TaintNodeNotReady would be automatically added by node controller
 	// when node is not ready, and removed when node becomes ready.
 	TaintNodeNotReady = "node.alpha.kubernetes.io/notReady"

-	// When the --use-taint-based-evictions flag is enabled,
+	// When feature-gate for TaintBasedEvictions=true flag is enabled,
 	// TaintNodeUnreachable would be automatically added by node controller
 	// when node becomes unreachable (corresponding to NodeReady status ConditionUnknown)
 	// and removed when node becomes reachable (NodeReady status ConditionTrue).