github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42786 from gyliu513/feature-gates

Browse Source 
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**:
This commit is contained in:
Kubernetes Submit Queue 2017-03-09 07:37:35 -08:00 committed by GitHub
commit 1a3c3be58b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/verify-flags/known-flags.txt
View File

@ -680,11 +680,9 @@ upgrade-target
use-kubernetes-cluster-service use-kubernetes-cluster-service
use-kubernetes-version use-kubernetes-version
use-service-account-credentials use-service-account-credentials
use-taint-based-evictions
user-whitelist user-whitelist
use-service-account-credentials use-service-account-credentials
use-service-account-credentials use-service-account-credentials
use-taint-based-evictions
verb verb
verify-only verify-only
versioned-clientset-package versioned-clientset-package

4
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go
View File

@ -34,12 +34,12 @@ const (
// fluentd in not running as a manifest pod with LabelFluentdDsReady. // fluentd in not running as a manifest pod with LabelFluentdDsReady.
LabelFluentdDsReady = "alpha.kubernetes.io/fluentd-ds-ready" 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 // TaintNodeNotReady would be automatically added by node controller
// when node is not ready, and removed when node becomes ready. // when node is not ready, and removed when node becomes ready.
TaintNodeNotReady = "node.alpha.kubernetes.io/notReady" 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 // TaintNodeUnreachable would be automatically added by node controller
// when node becomes unreachable (corresponding to NodeReady status ConditionUnknown) // when node becomes unreachable (corresponding to NodeReady status ConditionUnknown)
// and removed when node becomes reachable (NodeReady status ConditionTrue). // and removed when node becomes reachable (NodeReady status ConditionTrue).