From ed28695d3e7a947befbd5e5b5063665744ae05a2 Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Thu, 9 Mar 2017 16:34:49 +0800 Subject: [PATCH] Updated comments for TaintBasedEvictions. --- hack/verify-flags/known-flags.txt | 2 -- .../k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 3927af4e763..e79e55e63e9 100644 --- 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 diff --git 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 index a84ed35edb8..bd17546a4e8 100644 --- 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).