github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52264 from gmarek/tags

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 52264, 51870)

fix condition-taint labels

Ref. #51246
This commit is contained in:
Kubernetes Submit Queue 2017-09-12 02:10:20 -07:00 committed by GitHub
commit f60ffc2197
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/pkg/scheduler/algorithm/well_known_labels.go
View File

@ -31,22 +31,22 @@ const (
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeOutOfDisk would be automatically added by node controller // TaintNodeOutOfDisk would be automatically added by node controller
// when node becomes out of disk, and removed when node has enough disk. // when node becomes out of disk, and removed when node has enough disk.
TaintNodeOutOfDisk = "node.kubernetes.io/outOfDisk" TaintNodeOutOfDisk = "node.kubernetes.io/out-of-disk"
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeMemoryPressure would be automatically added by node controller // TaintNodeMemoryPressure would be automatically added by node controller
// when node has memory pressure, and removed when node has enough memory. // when node has memory pressure, and removed when node has enough memory.
TaintNodeMemoryPressure = "node.kubernetes.io/memoryPressure" TaintNodeMemoryPressure = "node.kubernetes.io/memory-pressure"
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeDiskPressure would be automatically added by node controller // TaintNodeDiskPressure would be automatically added by node controller
// when node has disk pressure, and removed when node has enough disk. // when node has disk pressure, and removed when node has enough disk.
TaintNodeDiskPressure = "node.kubernetes.io/diskPressure" TaintNodeDiskPressure = "node.kubernetes.io/disk-pressure"
// When feature-gate for TaintBasedEvictions=true flag is enabled, // When feature-gate for TaintBasedEvictions=true flag is enabled,
// TaintNodeNetworkUnavailable would be automatically added by node controller // TaintNodeNetworkUnavailable would be automatically added by node controller
// when node's network is unavailable, and removed when network becomes ready. // when node's network is unavailable, and removed when network becomes ready.
TaintNodeNetworkUnavailable = "node.kubernetes.io/networkUnavailable" TaintNodeNetworkUnavailable = "node.kubernetes.io/network-unavailable"
// When kubelet is started with the "external" cloud provider, then // When kubelet is started with the "external" cloud provider, then
// it sets this taint on a node to mark it as unusable, until a controller // it sets this taint on a node to mark it as unusable, until a controller