Merge pull request #18216 from RobertKrawitz/bugs/fix_hpa_replica_count

Automatic merge from submit-queue. Backport HPA replica count calculation fixes There were multiple fixes upstream to the HPA upstream logic regarding interaction of max replica count and the scaleup limit that could result in the replica count temporarily higher than the max replica count.
openshift · Jan 28, 2018 · b59a547 · b59a547
2 parents 6db4d4e + 58f6c8b
commit b59a547
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 31 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal_test.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal_test.go