github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14732 from jszczepkowski/hpa-api-fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-01 18:52:59 -07:00
commit e4164638c4
8 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/apis/experimental/deep_copy_generated.go
View File

@ -976,13 +976,8 @@ func deepCopy_experimental_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, o
if err := deepCopy_experimental_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { if err := deepCopy_experimental_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil {
return err return err
} }
if in.Status != nil { if err := deepCopy_experimental_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil {
out.Status = new(HorizontalPodAutoscalerStatus) return err
if err := deepCopy_experimental_HorizontalPodAutoscalerStatus(*in.Status, out.Status, c); err != nil {
return err
}
} else {
out.Status = nil
} }
return nil return nil
} }

2
pkg/apis/experimental/types.go
View File

@ -130,7 +130,7 @@ type HorizontalPodAutoscaler struct {
Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"` Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"`
// Status represents the current information about the autoscaler. // Status represents the current information about the autoscaler.
Status *HorizontalPodAutoscalerStatus `json:"status,omitempty"` Status HorizontalPodAutoscalerStatus `json:"status,omitempty"`
} }
// HorizontalPodAutoscaler is a collection of pod autoscalers. // HorizontalPodAutoscaler is a collection of pod autoscalers.

18
pkg/apis/experimental/v1alpha1/conversion_generated.go
View File

@ -2309,13 +2309,8 @@ func autoconvert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodA
if err := convert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { if err := convert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
if in.Status != nil { if err := convert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
out.Status = new(HorizontalPodAutoscalerStatus) return err
if err := convert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(in.Status, out.Status, s); err != nil {
return err
}
} else {
out.Status = nil
} }
return nil return nil
} }
@ -3115,13 +3110,8 @@ func autoconvert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodA
if err := convert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { if err := convert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
if in.Status != nil { if err := convert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
out.Status = new(experimental.HorizontalPodAutoscalerStatus) return err
if err := convert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(in.Status, out.Status, s); err != nil {
return err
}
} else {
out.Status = nil
} }
return nil return nil
} }

9
pkg/apis/experimental/v1alpha1/deep_copy_generated.go
View File

@ -988,13 +988,8 @@ func deepCopy_v1alpha1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *
if err := deepCopy_v1alpha1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { if err := deepCopy_v1alpha1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil {
return err return err
} }
if in.Status != nil { if err := deepCopy_v1alpha1_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil {
out.Status = new(HorizontalPodAutoscalerStatus) return err
if err := deepCopy_v1alpha1_HorizontalPodAutoscalerStatus(*in.Status, out.Status, c); err != nil {
return err
}
} else {
out.Status = nil
} }
return nil return nil
} }

2
pkg/apis/experimental/v1alpha1/types.go
View File

@ -120,7 +120,7 @@ type HorizontalPodAutoscaler struct {
Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"` Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"`
// Status represents the current information about the autoscaler. // Status represents the current information about the autoscaler.
Status *HorizontalPodAutoscalerStatus `json:"status,omitempty"` Status HorizontalPodAutoscalerStatus `json:"status,omitempty"`
} }
// HorizontalPodAutoscalerList is a list of HorizontalPodAutoscalers. // HorizontalPodAutoscalerList is a list of HorizontalPodAutoscalers.

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

@ -109,7 +109,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
// Going down only if the usageRatio dropped significantly below the target // Going down only if the usageRatio dropped significantly below the target
// and there was no rescaling in the last downscaleForbiddenWindow. // and there was no rescaling in the last downscaleForbiddenWindow.
if desiredReplicas < currentReplicas && usageRatio < (1-tolerance) && if desiredReplicas < currentReplicas && usageRatio < (1-tolerance) &&
(hpa.Status == nil || hpa.Status.LastScaleTimestamp == nil || (hpa.Status.LastScaleTimestamp == nil ||
hpa.Status.LastScaleTimestamp.Add(downscaleForbiddenWindow).Before(now)) { hpa.Status.LastScaleTimestamp.Add(downscaleForbiddenWindow).Before(now)) {
rescale = true rescale = true
} }
@ -117,7 +117,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
// Going up only if the usage ratio increased significantly above the target // Going up only if the usage ratio increased significantly above the target
// and there was no rescaling in the last upscaleForbiddenWindow. // and there was no rescaling in the last upscaleForbiddenWindow.
if desiredReplicas > currentReplicas && usageRatio > (1+tolerance) && if desiredReplicas > currentReplicas && usageRatio > (1+tolerance) &&
(hpa.Status == nil || hpa.Status.LastScaleTimestamp == nil || (hpa.Status.LastScaleTimestamp == nil ||
hpa.Status.LastScaleTimestamp.Add(upscaleForbiddenWindow).Before(now)) { hpa.Status.LastScaleTimestamp.Add(upscaleForbiddenWindow).Before(now)) {
rescale = true rescale = true
} }
@ -135,12 +135,11 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
desiredReplicas = currentReplicas desiredReplicas = currentReplicas
} }
status := experimental.HorizontalPodAutoscalerStatus{ hpa.Status = experimental.HorizontalPodAutoscalerStatus{
CurrentReplicas: currentReplicas, CurrentReplicas: currentReplicas,
DesiredReplicas: desiredReplicas, DesiredReplicas: desiredReplicas,
CurrentConsumption: currentConsumption, CurrentConsumption: currentConsumption,
} }
hpa.Status = &status
if rescale { if rescale {
now := unversioned.NewTime(now) now := unversioned.NewTime(now)
hpa.Status.LastScaleTimestamp = &now hpa.Status.LastScaleTimestamp = &now

2
pkg/kubectl/describe.go
View File

@ -1260,7 +1260,7 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str
hpa.Spec.Target.Resource) hpa.Spec.Target.Resource)
fmt.Fprintf(out, "Current resource consumption:\t") fmt.Fprintf(out, "Current resource consumption:\t")
if hpa.Status != nil && hpa.Status.CurrentConsumption != nil { if hpa.Status.CurrentConsumption != nil {
fmt.Fprintf(out, "%s %s\n", fmt.Fprintf(out, "%s %s\n",
hpa.Status.CurrentConsumption.Quantity.String(), hpa.Status.CurrentConsumption.Quantity.String(),
hpa.Status.CurrentConsumption.Resource) hpa.Status.CurrentConsumption.Resource)

2
pkg/kubectl/resource_printer.go
View File

@ -1281,7 +1281,7 @@ func printHorizontalPodAutoscaler(hpa *experimental.HorizontalPodAutoscaler, w i
target := fmt.Sprintf("%s %v", hpa.Spec.Target.Quantity.String(), hpa.Spec.Target.Resource) target := fmt.Sprintf("%s %v", hpa.Spec.Target.Quantity.String(), hpa.Spec.Target.Resource)
current := "<waiting>" current := "<waiting>"
if hpa.Status != nil && hpa.Status.CurrentConsumption != nil { if hpa.Status.CurrentConsumption != nil {
current = fmt.Sprintf("%s %v", hpa.Status.CurrentConsumption.Quantity.String(), hpa.Status.CurrentConsumption.Resource) current = fmt.Sprintf("%s %v", hpa.Status.CurrentConsumption.Quantity.String(), hpa.Status.CurrentConsumption.Resource)
} }
minPods := hpa.Spec.MinReplicas minPods := hpa.Spec.MinReplicas