github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79859 from sukeesh/hpa-error-log-fix

Browse Source 
HPA incorrectly reported condition status
This commit is contained in:
Kubernetes Prow Robot
2019-07-11 07:28:55 -07:00
committed by GitHub
parent d11eb67c02 44c3f0105f
commit b500c740ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/podautoscaler/horizontal.go
View File

@@ -732,13 +732,13 @@ func convertDesiredReplicasWithRules(currentReplicas, desiredReplicas, hpaMinRep
possibleLimitingReason = "the desired replica count is increasing faster than the maximum scale rate" possibleLimitingReason = "the desired replica count is increasing faster than the maximum scale rate"
} else { } else {
maximumAllowedReplicas = hpaMaxReplicas maximumAllowedReplicas = hpaMaxReplicas
possibleLimitingCondition = "TooManyReplicas" possibleLimitingCondition = "TooManyReplicas"
possibleLimitingReason = "the desired replica count is more than the maximum replica count" possibleLimitingReason = "the desired replica count is more than the maximum replica count"
} }
if desiredReplicas < minimumAllowedReplicas { if desiredReplicas < minimumAllowedReplicas {
possibleLimitingCondition = "TooFewReplicas" possibleLimitingCondition = "TooFewReplicas"
possibleLimitingReason = "the desired replica count is less than the minimum replica count"
return minimumAllowedReplicas, possibleLimitingCondition, possibleLimitingReason return minimumAllowedReplicas, possibleLimitingCondition, possibleLimitingReason
} else if desiredReplicas > maximumAllowedReplicas { } else if desiredReplicas > maximumAllowedReplicas {

2
pkg/controller/podautoscaler/horizontal_test.go
View File

@@ -2494,7 +2494,7 @@ func TestAvoidUncessaryUpdates(t *testing.T) {
Status: v1.ConditionTrue, Status: v1.ConditionTrue,
LastTransitionTime: *tc.lastScaleTime, LastTransitionTime: *tc.lastScaleTime,
Reason: "TooFewReplicas", Reason: "TooFewReplicas",
Message: "the desired replica count is more than the maximum replica count", Message: "the desired replica count is less than the minimum replica count",
}, },
}, },
}, },