Use NodeDiskPressure conditino instead of NodeOutOfDisk

This commit is contained in:
Łukasz Osipiuk 2019-09-04 16:57:55 +02:00
parent 002db2c196
commit 79b4614328
4 changed files with 4 additions and 4 deletions

View File

@ -51,7 +51,7 @@ func BuildReadyConditions() []apiv1.NodeCondition {
LastTransitionTime: metav1.Time{Time: lastTransition}, LastTransitionTime: metav1.Time{Time: lastTransition},
}, },
{ {
Type: apiv1.NodeOutOfDisk, Type: apiv1.NodeDiskPressure,
Status: apiv1.ConditionFalse, Status: apiv1.ConditionFalse,
LastTransitionTime: metav1.Time{Time: lastTransition}, LastTransitionTime: metav1.Time{Time: lastTransition},
}, },

View File

@ -862,7 +862,7 @@ func isNodeStillStarting(node *apiv1.Node) bool {
condition.LastTransitionTime.Time.Sub(node.CreationTimestamp.Time) < MaxStatusSettingDelayAfterCreation { condition.LastTransitionTime.Time.Sub(node.CreationTimestamp.Time) < MaxStatusSettingDelayAfterCreation {
return true return true
} }
if condition.Type == apiv1.NodeOutOfDisk && if condition.Type == apiv1.NodeDiskPressure &&
condition.Status == apiv1.ConditionTrue && condition.Status == apiv1.ConditionTrue &&
condition.LastTransitionTime.Time.Sub(node.CreationTimestamp.Time) < MaxStatusSettingDelayAfterCreation { condition.LastTransitionTime.Time.Sub(node.CreationTimestamp.Time) < MaxStatusSettingDelayAfterCreation {
return true return true

View File

@ -771,7 +771,7 @@ func TestIsNodeStillStarting(t *testing.T) {
}{ }{
{"unready", apiv1.NodeReady, apiv1.ConditionFalse, true}, {"unready", apiv1.NodeReady, apiv1.ConditionFalse, true},
{"readiness unknown", apiv1.NodeReady, apiv1.ConditionUnknown, true}, {"readiness unknown", apiv1.NodeReady, apiv1.ConditionUnknown, true},
{"out of disk", apiv1.NodeOutOfDisk, apiv1.ConditionTrue, true}, {"out of disk", apiv1.NodeDiskPressure, apiv1.ConditionTrue, true},
{"network unavailable", apiv1.NodeNetworkUnavailable, apiv1.ConditionTrue, true}, {"network unavailable", apiv1.NodeNetworkUnavailable, apiv1.ConditionTrue, true},
{"started", apiv1.NodeReady, apiv1.ConditionTrue, false}, {"started", apiv1.NodeReady, apiv1.ConditionTrue, false},
} }

View File

@ -51,7 +51,7 @@ func GetReadinessState(node *apiv1.Node) (isNodeReady bool, lastTransitionTime t
if lastTransitionTime.Before(cond.LastTransitionTime.Time) { if lastTransitionTime.Before(cond.LastTransitionTime.Time) {
lastTransitionTime = cond.LastTransitionTime.Time lastTransitionTime = cond.LastTransitionTime.Time
} }
case apiv1.NodeOutOfDisk: case apiv1.NodeDiskPressure:
if cond.Status == apiv1.ConditionTrue { if cond.Status == apiv1.ConditionTrue {
canNodeBeReady = false canNodeBeReady = false
} }