github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14106 from jszczepkowski/hpa-api

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-19 22:23:06 -07:00
parent 8c3da5d9cc 7fcf7f1177
commit c2f76e4ce7
15 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,8 +93,8 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
usageRatio := float64(currentConsumption.Quantity.MilliValue()) / float64(hpa.Spec.Target.Quantity.MilliValue())
desiredReplicas := int(math.Ceil(usageRatio * float64(currentReplicas)))
if desiredReplicas < hpa.Spec.MinCount {
desiredReplicas = hpa.Spec.MinCount
if desiredReplicas < hpa.Spec.MinReplicas {
desiredReplicas = hpa.Spec.MinReplicas
}
// TODO: remove when pod ideling is done.
@@ -102,8 +102,8 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
desiredReplicas = 1
}
if desiredReplicas > hpa.Spec.MaxCount {
desiredReplicas = hpa.Spec.MaxCount
if desiredReplicas > hpa.Spec.MaxReplicas {
desiredReplicas = hpa.Spec.MaxReplicas
}
now := time.Now()
rescale := false