Skip to content

K
k3s
Commit f3e0bb0d authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #15706 from jszczepkowski/hpa-beta-util

HorizontalPodAutoscaler and Scale subresource APIs graduated to beta.
parents 4b983584 df732f06
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 530 additions and 515 deletions
api/swagger-spec/v1beta1.json
View file @ f3e0bb0d
...@@ -2076,7 +2076,7 @@ ...@@ -2076,7 +2076,7 @@
"models": { "models": {
"v1beta1.HorizontalPodAutoscalerList": { "v1beta1.HorizontalPodAutoscalerList": {
"id": "v1beta1.HorizontalPodAutoscalerList", "id": "v1beta1.HorizontalPodAutoscalerList",
"description": "HorizontalPodAutoscalerList is a list of HorizontalPodAutoscalers.", "description": "list of horizontal pod autoscaler objects.",
"required": [ "required": [
"items" "items"
], ],
...@@ -2098,7 +2098,7 @@ ...@@ -2098,7 +2098,7 @@
"items": { "items": {
"$ref": "v1beta1.HorizontalPodAutoscaler" "$ref": "v1beta1.HorizontalPodAutoscaler"
}, },
"description": "Items is the list of HorizontalPodAutoscalers." "description": "list of horizontal pod autoscaler objects."
} }
} }
}, },
...@@ -2118,7 +2118,7 @@ ...@@ -2118,7 +2118,7 @@
}, },
"v1beta1.HorizontalPodAutoscaler": { "v1beta1.HorizontalPodAutoscaler": {
"id": "v1beta1.HorizontalPodAutoscaler", "id": "v1beta1.HorizontalPodAutoscaler",
"description": "HorizontalPodAutoscaler represents the configuration of a horizontal pod autoscaler.", "description": "configuration of a horizontal pod autoscaler.",
"properties": { "properties": {
"kind": { "kind": {
"type": "string", "type": "string",
...@@ -2134,11 +2134,11 @@ ...@@ -2134,11 +2134,11 @@
}, },
"spec": { "spec": {
"$ref": "v1beta1.HorizontalPodAutoscalerSpec", "$ref": "v1beta1.HorizontalPodAutoscalerSpec",
"description": "Spec defines the behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status." "description": "behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status."
}, },
"status": { "status": {
"$ref": "v1beta1.HorizontalPodAutoscalerStatus", "$ref": "v1beta1.HorizontalPodAutoscalerStatus",
"description": "Status represents the current information about the autoscaler." "description": "current information about the autoscaler."
} }
} }
}, },
...@@ -2200,31 +2200,29 @@ ...@@ -2200,31 +2200,29 @@
}, },
"v1beta1.HorizontalPodAutoscalerSpec": { "v1beta1.HorizontalPodAutoscalerSpec": {
"id": "v1beta1.HorizontalPodAutoscalerSpec", "id": "v1beta1.HorizontalPodAutoscalerSpec",
"description": "HorizontalPodAutoscalerSpec is the specification of a horizontal pod autoscaler.", "description": "specification of a horizontal pod autoscaler.",
"required": [ "required": [
"scaleRef", "scaleRef",
"minReplicas", "maxReplicas"
"maxReplicas",
"target"
], ],
"properties": { "properties": {
"scaleRef": { "scaleRef": {
"$ref": "v1beta1.SubresourceReference", "$ref": "v1beta1.SubresourceReference",
"description": "ScaleRef is a reference to Scale subresource. HorizontalPodAutoscaler will learn the current resource consumption from its status, and will set the desired number of pods by modyfying its spec." "description": "reference to Scale subresource; horizontal pod autoscaler will learn the current resource consumption from its status, and will set the desired number of pods by modifying its spec."
}, },
"minReplicas": { "minReplicas": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "MinReplicas is the lower limit for the number of pods that can be set by the autoscaler." "description": "lower limit for the number of pods that can be set by the autoscaler, default 1."
}, },
"maxReplicas": { "maxReplicas": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "MaxReplicas is the upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas." "description": "upper limit for the number of pods that can be set by the autoscaler; cannot be smaller than MinReplicas."
}, },
"target": { "cpuUtilization": {
"$ref": "v1beta1.ResourceConsumption", "$ref": "v1beta1.CPUTargetUtilization",
"description": "Target is the target average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. Currently two types of resources are supported: \"cpu\" and \"memory\"." "description": "target average CPU utilization (represented as a percentage of requested CPU) over all the pods; if not specified it defaults to the target CPU utilization at 80% of the requested resources."
} }
} }
}, },
...@@ -2254,46 +2252,50 @@ ...@@ -2254,46 +2252,50 @@
} }
} }
}, },
"v1beta1.ResourceConsumption": { "v1beta1.CPUTargetUtilization": {
"id": "v1beta1.ResourceConsumption", "id": "v1beta1.CPUTargetUtilization",
"description": "ResourceConsumption is an object for specifying average resource consumption of a particular resource.", "required": [
"targetPercentage"
],
"properties": { "properties": {
"resource": { "targetPercentage": {
"type": "string", "type": "integer",
"description": "Resource specifies either the name of the target resource when present in the spec, or the name of the observed resource when present in the status." "format": "int32",
}, "description": "fraction of the requested CPU that should be utilized/used, e.g. 70 means that 70% of the requested CPU should be in use."
"quantity": {
"type": "string",
"description": "Quantity specifies either the target average consumption of the resource when present in the spec, or the observed average consumption when present in the status."
} }
} }
}, },
"v1beta1.HorizontalPodAutoscalerStatus": { "v1beta1.HorizontalPodAutoscalerStatus": {
"id": "v1beta1.HorizontalPodAutoscalerStatus", "id": "v1beta1.HorizontalPodAutoscalerStatus",
"description": "HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler", "description": "current status of a horizontal pod autoscaler",
"required": [ "required": [
"currentReplicas", "currentReplicas",
"desiredReplicas", "desiredReplicas"
"currentConsumption"
], ],
"properties": { "properties": {
"observedGeneration": {
"type": "integer",
"format": "int64",
"description": "most recent generation observed by this autoscaler."
},
"lastScaleTime": {
"type": "string",
"description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed."
},
"currentReplicas": { "currentReplicas": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "CurrentReplicas is the number of replicas of pods managed by this autoscaler." "description": "current number of replicas of pods managed by this autoscaler."
}, },
"desiredReplicas": { "desiredReplicas": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "DesiredReplicas is the desired number of replicas of pods managed by this autoscaler." "description": "desired number of replicas of pods managed by this autoscaler."
}, },
"currentConsumption": { "currentCPUUtilizationPercentage": {
"$ref": "v1beta1.ResourceConsumption", "type": "integer",
"description": "CurrentConsumption is the current average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. Two types of resources are supported: \"cpu\" and \"memory\"." "format": "int32",
}, "description": "current average CPU utilization over all pods, represented as a percentage of requested CPU, e.g. 70 means that an average pod is using now 70% of its requested CPU."
"lastScaleTimestamp": {
"type": "string",
"description": "LastScaleTimestamp is the last time the HorizontalPodAutoscaler scaled the number of pods. This is used by the autoscaler to controll how often the number of pods is changed."
} }
} }
}, },
......
pkg/api/testing/fuzzer.go
View file @ f3e0bb0d
...@@ -368,6 +368,12 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer { ...@@ -368,6 +368,12 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
// string, which will cause tests failure. // string, which will cause tests failure.
s.APIGroup = "something" s.APIGroup = "something"
}, },
func(s *extensions.HorizontalPodAutoscalerSpec, c fuzz.Continue) {
c.FuzzNoCustom(s) // fuzz self without calling this function again
minReplicas := c.Rand.Int()
s.MinReplicas = &minReplicas
s.CPUUtilization = &extensions.CPUTargetUtilization{TargetPercentage: int(c.RandUint64())}
},
) )
return f return f
} }
pkg/apis/extensions/deep_copy_generated.go
View file @ f3e0bb0d
...@@ -848,6 +848,11 @@ func deepCopy_extensions_APIVersion(in APIVersion, out *APIVersion, c *conversio ...@@ -848,6 +848,11 @@ func deepCopy_extensions_APIVersion(in APIVersion, out *APIVersion, c *conversio
return nil return nil
} }
func deepCopy_extensions_CPUTargetUtilization(in CPUTargetUtilization, out *CPUTargetUtilization, c *conversion.Cloner) error {
out.TargetPercentage = in.TargetPercentage
return nil
}
func deepCopy_extensions_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { func deepCopy_extensions_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error {
if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
return err return err
...@@ -1099,40 +1104,49 @@ func deepCopy_extensions_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerL ...@@ -1099,40 +1104,49 @@ func deepCopy_extensions_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerL
} }
func deepCopy_extensions_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { func deepCopy_extensions_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
if in.ScaleRef != nil { if err := deepCopy_extensions_SubresourceReference(in.ScaleRef, &out.ScaleRef, c); err != nil {
out.ScaleRef = new(SubresourceReference) return err
if err := deepCopy_extensions_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { }
return err if in.MinReplicas != nil {
} out.MinReplicas = new(int)
*out.MinReplicas = *in.MinReplicas
} else { } else {
out.ScaleRef = nil out.MinReplicas = nil
} }
out.MinReplicas = in.MinReplicas
out.MaxReplicas = in.MaxReplicas out.MaxReplicas = in.MaxReplicas
if err := deepCopy_extensions_ResourceConsumption(in.Target, &out.Target, c); err != nil { if in.CPUUtilization != nil {
return err out.CPUUtilization = new(CPUTargetUtilization)
if err := deepCopy_extensions_CPUTargetUtilization(*in.CPUUtilization, out.CPUUtilization, c); err != nil {
return err
}
} else {
out.CPUUtilization = nil
} }
return nil return nil
} }
func deepCopy_extensions_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { func deepCopy_extensions_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error {
out.CurrentReplicas = in.CurrentReplicas if in.ObservedGeneration != nil {
out.DesiredReplicas = in.DesiredReplicas out.ObservedGeneration = new(int64)
if in.CurrentConsumption != nil { *out.ObservedGeneration = *in.ObservedGeneration
out.CurrentConsumption = new(ResourceConsumption)
if err := deepCopy_extensions_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil {
return err
}
} else { } else {
out.CurrentConsumption = nil out.ObservedGeneration = nil
} }
if in.LastScaleTimestamp != nil { if in.LastScaleTime != nil {
out.LastScaleTimestamp = new(unversioned.Time) out.LastScaleTime = new(unversioned.Time)
if err := deepCopy_unversioned_Time(*in.LastScaleTimestamp, out.LastScaleTimestamp, c); err != nil { if err := deepCopy_unversioned_Time(*in.LastScaleTime, out.LastScaleTime, c); err != nil {
return err return err
} }
} else { } else {
out.LastScaleTimestamp = nil out.LastScaleTime = nil
}
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
if in.CurrentCPUUtilizationPercentage != nil {
out.CurrentCPUUtilizationPercentage = new(int)
*out.CurrentCPUUtilizationPercentage = *in.CurrentCPUUtilizationPercentage
} else {
out.CurrentCPUUtilizationPercentage = nil
} }
return nil return nil
} }
...@@ -1389,14 +1403,6 @@ func deepCopy_extensions_ReplicationControllerDummy(in ReplicationControllerDumm ...@@ -1389,14 +1403,6 @@ func deepCopy_extensions_ReplicationControllerDummy(in ReplicationControllerDumm
return nil return nil
} }
func deepCopy_extensions_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error {
out.Resource = in.Resource
if err := deepCopy_resource_Quantity(in.Quantity, &out.Quantity, c); err != nil {
return err
}
return nil
}
func deepCopy_extensions_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { func deepCopy_extensions_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error {
if err := deepCopy_util_IntOrString(in.MaxUnavailable, &out.MaxUnavailable, c); err != nil { if err := deepCopy_util_IntOrString(in.MaxUnavailable, &out.MaxUnavailable, c); err != nil {
return err return err
...@@ -1586,6 +1592,7 @@ func init() { ...@@ -1586,6 +1592,7 @@ func init() {
deepCopy_unversioned_Time, deepCopy_unversioned_Time,
deepCopy_unversioned_TypeMeta, deepCopy_unversioned_TypeMeta,
deepCopy_extensions_APIVersion, deepCopy_extensions_APIVersion,
deepCopy_extensions_CPUTargetUtilization,
deepCopy_extensions_ClusterAutoscaler, deepCopy_extensions_ClusterAutoscaler,
deepCopy_extensions_ClusterAutoscalerList, deepCopy_extensions_ClusterAutoscalerList,
deepCopy_extensions_ClusterAutoscalerSpec, deepCopy_extensions_ClusterAutoscalerSpec,
...@@ -1620,7 +1627,6 @@ func init() { ...@@ -1620,7 +1627,6 @@ func init() {
deepCopy_extensions_PodSelector, deepCopy_extensions_PodSelector,
deepCopy_extensions_PodSelectorRequirement, deepCopy_extensions_PodSelectorRequirement,
deepCopy_extensions_ReplicationControllerDummy, deepCopy_extensions_ReplicationControllerDummy,
deepCopy_extensions_ResourceConsumption,
deepCopy_extensions_RollingUpdateDeployment, deepCopy_extensions_RollingUpdateDeployment,
deepCopy_extensions_Scale, deepCopy_extensions_Scale,
deepCopy_extensions_ScaleSpec, deepCopy_extensions_ScaleSpec,
......
pkg/apis/extensions/types.go
View file @ f3e0bb0d
...@@ -30,36 +30,35 @@ package extensions ...@@ -30,36 +30,35 @@ package extensions
import ( import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )
// ScaleSpec describes the attributes a Scale subresource // describes the attributes of a scale subresource
type ScaleSpec struct { type ScaleSpec struct {
// Replicas is the number of desired replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller" // desired number of instances for the scaled object.
Replicas int `json:"replicas,omitempty"` Replicas int `json:"replicas,omitempty"`
} }
// ScaleStatus represents the current status of a Scale subresource. // represents the current status of a scale subresource.
type ScaleStatus struct { type ScaleStatus struct {
// Replicas is the number of actual replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller // actual number of observed instances of the scaled object.
Replicas int `json:"replicas"` Replicas int `json:"replicas"`
// Selector is a label query over pods that should match the replicas count. If it is empty, it is defaulted to labels on Pod template; More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors // label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors
Selector map[string]string `json:"selector,omitempty"` Selector map[string]string `json:"selector,omitempty"`
} }
// Scale subresource, applicable to ReplicationControllers and (in future) Deployment. // represents a scaling request for a resource.
type Scale struct { type Scale struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
// Spec defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
Spec ScaleSpec `json:"spec,omitempty"` Spec ScaleSpec `json:"spec,omitempty"`
// Status represents the current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only. // current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only.
Status ScaleStatus `json:"status,omitempty"` Status ScaleStatus `json:"status,omitempty"`
} }
...@@ -82,63 +81,64 @@ type SubresourceReference struct { ...@@ -82,63 +81,64 @@ type SubresourceReference struct {
Subresource string `json:"subresource,omitempty"` Subresource string `json:"subresource,omitempty"`
} }
// ResourceConsumption is an object for specifying average resource consumption of a particular resource. type CPUTargetUtilization struct {
type ResourceConsumption struct { // fraction of the requested CPU that should be utilized/used,
Resource api.ResourceName `json:"resource,omitempty"` // e.g. 70 means that 70% of the requested CPU should be in use.
Quantity resource.Quantity `json:"quantity,omitempty"` TargetPercentage int `json:"targetPercentage"`
} }
// HorizontalPodAutoscalerSpec is the specification of a horizontal pod autoscaler. // specification of a horizontal pod autoscaler.
type HorizontalPodAutoscalerSpec struct { type HorizontalPodAutoscalerSpec struct {
// ScaleRef is a reference to Scale subresource. HorizontalPodAutoscaler will learn the current resource consumption from its status, // reference to Scale subresource; horizontal pod autoscaler will learn the current resource consumption from its status,
// and will set the desired number of pods by modyfying its spec. // and will set the desired number of pods by modifying its spec.
ScaleRef *SubresourceReference `json:"scaleRef"` ScaleRef SubresourceReference `json:"scaleRef"`
// MinReplicas is the lower limit for the number of pods that can be set by the autoscaler. // lower limit for the number of pods that can be set by the autoscaler, default 1.
MinReplicas int `json:"minReplicas"` MinReplicas *int `json:"minReplicas,omitempty"`
// MaxReplicas is the upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas. // upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas.
MaxReplicas int `json:"maxReplicas"` MaxReplicas int `json:"maxReplicas"`
// Target is the target average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. // target average CPU utilization (represented as a percentage of requested CPU) over all the pods;
// Currently two types of resources are supported: "cpu" and "memory". // if not specified it defaults to the target CPU utilization at 80% of the requested resources.
Target ResourceConsumption `json:"target"` CPUUtilization *CPUTargetUtilization `json:"cpuUtilization,omitempty"`
} }
// HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler // current status of a horizontal pod autoscaler
type HorizontalPodAutoscalerStatus struct { type HorizontalPodAutoscalerStatus struct {
// TODO: Consider if it is needed. // most recent generation observed by this autoscaler.
// CurrentReplicas is the number of replicas of pods managed by this autoscaler. ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
// last time the HorizontalPodAutoscaler scaled the number of pods;
// used by the autoscaler to control how often the number of pods is changed.
LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty"`
// current number of replicas of pods managed by this autoscaler.
CurrentReplicas int `json:"currentReplicas"` CurrentReplicas int `json:"currentReplicas"`
// DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. // desired number of replicas of pods managed by this autoscaler.
DesiredReplicas int `json:"desiredReplicas"` DesiredReplicas int `json:"desiredReplicas"`
// CurrentConsumption is the current average consumption of the given resource that the autoscaler will // current average CPU utilization over all pods, represented as a percentage of requested CPU,
// try to maintain by adjusting the desired number of pods. // e.g. 70 means that an average pod is using now 70% of its requested CPU.
// Two types of resources are supported: "cpu" and "memory". CurrentCPUUtilizationPercentage *int `json:"currentCPUUtilizationPercentage,omitempty"`
CurrentConsumption *ResourceConsumption `json:"currentConsumption"`
// LastScaleTimestamp is the last time the HorizontalPodAutoscaler scaled the number of pods.
// This is used by the autoscaler to controll how often the number of pods is changed.
LastScaleTimestamp *unversioned.Time `json:"lastScaleTimestamp,omitempty"`
} }
// HorizontalPodAutoscaler represents the configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
// Spec defines the behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"` Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"`
// Status represents the current information about the autoscaler. // current information about the autoscaler.
Status HorizontalPodAutoscalerStatus `json:"status,omitempty"` Status HorizontalPodAutoscalerStatus `json:"status,omitempty"`
} }
// HorizontalPodAutoscaler is a collection of pod autoscalers. // list of horizontal pod autoscaler objects.
type HorizontalPodAutoscalerList struct { type HorizontalPodAutoscalerList struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
unversioned.ListMeta `json:"metadata,omitempty"` unversioned.ListMeta `json:"metadata,omitempty"`
// Items is the list of horizontal pod autoscalers. // list of horizontal pod autoscaler objects.
Items []HorizontalPodAutoscaler `json:"items"` Items []HorizontalPodAutoscaler `json:"items"`
} }
......
pkg/apis/extensions/v1beta1/deep_copy_generated.go
View file @ f3e0bb0d
...@@ -850,6 +850,11 @@ func deepCopy_v1beta1_APIVersion(in APIVersion, out *APIVersion, c *conversion.C ...@@ -850,6 +850,11 @@ func deepCopy_v1beta1_APIVersion(in APIVersion, out *APIVersion, c *conversion.C
return nil return nil
} }
func deepCopy_v1beta1_CPUTargetUtilization(in CPUTargetUtilization, out *CPUTargetUtilization, c *conversion.Cloner) error {
out.TargetPercentage = in.TargetPercentage
return nil
}
func deepCopy_v1beta1_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { func deepCopy_v1beta1_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error {
if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
return err return err
...@@ -1111,40 +1116,49 @@ func deepCopy_v1beta1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList ...@@ -1111,40 +1116,49 @@ func deepCopy_v1beta1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList
} }
func deepCopy_v1beta1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { func deepCopy_v1beta1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error {
if in.ScaleRef != nil { if err := deepCopy_v1beta1_SubresourceReference(in.ScaleRef, &out.ScaleRef, c); err != nil {
out.ScaleRef = new(SubresourceReference) return err
if err := deepCopy_v1beta1_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { }
return err if in.MinReplicas != nil {
} out.MinReplicas = new(int)
*out.MinReplicas = *in.MinReplicas
} else { } else {
out.ScaleRef = nil out.MinReplicas = nil
} }
out.MinReplicas = in.MinReplicas
out.MaxReplicas = in.MaxReplicas out.MaxReplicas = in.MaxReplicas
if err := deepCopy_v1beta1_ResourceConsumption(in.Target, &out.Target, c); err != nil { if in.CPUUtilization != nil {
return err out.CPUUtilization = new(CPUTargetUtilization)
if err := deepCopy_v1beta1_CPUTargetUtilization(*in.CPUUtilization, out.CPUUtilization, c); err != nil {
return err
}
} else {
out.CPUUtilization = nil
} }
return nil return nil
} }
func deepCopy_v1beta1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { func deepCopy_v1beta1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error {
out.CurrentReplicas = in.CurrentReplicas if in.ObservedGeneration != nil {
out.DesiredReplicas = in.DesiredReplicas out.ObservedGeneration = new(int64)
if in.CurrentConsumption != nil { *out.ObservedGeneration = *in.ObservedGeneration
out.CurrentConsumption = new(ResourceConsumption)
if err := deepCopy_v1beta1_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil {
return err
}
} else { } else {
out.CurrentConsumption = nil out.ObservedGeneration = nil
} }
if in.LastScaleTimestamp != nil { if in.LastScaleTime != nil {
out.LastScaleTimestamp = new(unversioned.Time) out.LastScaleTime = new(unversioned.Time)
if err := deepCopy_unversioned_Time(*in.LastScaleTimestamp, out.LastScaleTimestamp, c); err != nil { if err := deepCopy_unversioned_Time(*in.LastScaleTime, out.LastScaleTime, c); err != nil {
return err return err
} }
} else { } else {
out.LastScaleTimestamp = nil out.LastScaleTime = nil
}
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
if in.CurrentCPUUtilizationPercentage != nil {
out.CurrentCPUUtilizationPercentage = new(int)
*out.CurrentCPUUtilizationPercentage = *in.CurrentCPUUtilizationPercentage
} else {
out.CurrentCPUUtilizationPercentage = nil
} }
return nil return nil
} }
...@@ -1401,14 +1415,6 @@ func deepCopy_v1beta1_ReplicationControllerDummy(in ReplicationControllerDummy, ...@@ -1401,14 +1415,6 @@ func deepCopy_v1beta1_ReplicationControllerDummy(in ReplicationControllerDummy,
return nil return nil
} }
func deepCopy_v1beta1_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error {
out.Resource = in.Resource
if err := deepCopy_resource_Quantity(in.Quantity, &out.Quantity, c); err != nil {
return err
}
return nil
}
func deepCopy_v1beta1_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { func deepCopy_v1beta1_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error {
if in.MaxUnavailable != nil { if in.MaxUnavailable != nil {
out.MaxUnavailable = new(util.IntOrString) out.MaxUnavailable = new(util.IntOrString)
...@@ -1608,6 +1614,7 @@ func init() { ...@@ -1608,6 +1614,7 @@ func init() {
deepCopy_v1_VolumeMount, deepCopy_v1_VolumeMount,
deepCopy_v1_VolumeSource, deepCopy_v1_VolumeSource,
deepCopy_v1beta1_APIVersion, deepCopy_v1beta1_APIVersion,
deepCopy_v1beta1_CPUTargetUtilization,
deepCopy_v1beta1_ClusterAutoscaler, deepCopy_v1beta1_ClusterAutoscaler,
deepCopy_v1beta1_ClusterAutoscalerList, deepCopy_v1beta1_ClusterAutoscalerList,
deepCopy_v1beta1_ClusterAutoscalerSpec, deepCopy_v1beta1_ClusterAutoscalerSpec,
...@@ -1642,7 +1649,6 @@ func init() { ...@@ -1642,7 +1649,6 @@ func init() {
deepCopy_v1beta1_PodSelector, deepCopy_v1beta1_PodSelector,
deepCopy_v1beta1_PodSelectorRequirement, deepCopy_v1beta1_PodSelectorRequirement,
deepCopy_v1beta1_ReplicationControllerDummy, deepCopy_v1beta1_ReplicationControllerDummy,
deepCopy_v1beta1_ResourceConsumption,
deepCopy_v1beta1_RollingUpdateDeployment, deepCopy_v1beta1_RollingUpdateDeployment,
deepCopy_v1beta1_Scale, deepCopy_v1beta1_Scale,
deepCopy_v1beta1_ScaleSpec, deepCopy_v1beta1_ScaleSpec,
......
pkg/apis/extensions/v1beta1/defaults.go
View file @ f3e0bb0d
...@@ -109,5 +109,14 @@ func addDefaultingFuncs() { ...@@ -109,5 +109,14 @@ func addDefaultingFuncs() {
obj.Spec.Parallelism = obj.Spec.Completions obj.Spec.Parallelism = obj.Spec.Completions
} }
}, },
func(obj *HorizontalPodAutoscaler) {
if obj.Spec.MinReplicas == nil {
minReplicas := 1
obj.Spec.MinReplicas = &minReplicas
}
if obj.Spec.CPUUtilization == nil {
obj.Spec.CPUUtilization = &CPUTargetUtilization{TargetPercentage: 80}
}
},
) )
} }
pkg/apis/extensions/v1beta1/types.go
View file @ f3e0bb0d
...@@ -17,37 +17,36 @@ limitations under the License. ...@@ -17,37 +17,36 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )
// ScaleSpec describes the attributes a Scale subresource // describes the attributes of a scale subresource
type ScaleSpec struct { type ScaleSpec struct {
// Replicas is the number of desired replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller" // desired number of instances for the scaled object.
Replicas int `json:"replicas,omitempty"` Replicas int `json:"replicas,omitempty"`
} }
// ScaleStatus represents the current status of a Scale subresource. // represents the current status of a scale subresource.
type ScaleStatus struct { type ScaleStatus struct {
// Replicas is the number of actual replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller // actual number of observed instances of the scaled object.
Replicas int `json:"replicas"` Replicas int `json:"replicas"`
// Selector is a label query over pods that should match the replicas count. If it is empty, it is defaulted to labels on Pod template; More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors // label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors
Selector map[string]string `json:"selector,omitempty"` Selector map[string]string `json:"selector,omitempty"`
} }
// Scale subresource, applicable to ReplicationControllers and (in future) Deployment. // represents a scaling request for a resource.
type Scale struct { type Scale struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
v1.ObjectMeta `json:"metadata,omitempty"` v1.ObjectMeta `json:"metadata,omitempty"`
// Spec defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
Spec ScaleSpec `json:"spec,omitempty"` Spec ScaleSpec `json:"spec,omitempty"`
// Status represents the current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only. // current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only.
Status ScaleStatus `json:"status,omitempty"` Status ScaleStatus `json:"status,omitempty"`
} }
...@@ -70,66 +69,66 @@ type SubresourceReference struct { ...@@ -70,66 +69,66 @@ type SubresourceReference struct {
Subresource string `json:"subresource,omitempty"` Subresource string `json:"subresource,omitempty"`
} }
// ResourceConsumption is an object for specifying average resource consumption of a particular resource. type CPUTargetUtilization struct {
type ResourceConsumption struct { // fraction of the requested CPU that should be utilized/used,
// Resource specifies either the name of the target resource when present in the spec, or the name of the observed resource when present in the status. // e.g. 70 means that 70% of the requested CPU should be in use.
Resource v1.ResourceName `json:"resource,omitempty"` TargetPercentage int `json:"targetPercentage"`
// Quantity specifies either the target average consumption of the resource when present in the spec, or the observed average consumption when present in the status.
Quantity resource.Quantity `json:"quantity,omitempty"`
} }
// HorizontalPodAutoscalerSpec is the specification of a horizontal pod autoscaler. // specification of a horizontal pod autoscaler.
type HorizontalPodAutoscalerSpec struct { type HorizontalPodAutoscalerSpec struct {
// ScaleRef is a reference to Scale subresource. HorizontalPodAutoscaler will learn the current resource consumption from its status, // reference to Scale subresource; horizontal pod autoscaler will learn the current resource consumption from its status,
// and will set the desired number of pods by modyfying its spec. // and will set the desired number of pods by modifying its spec.
ScaleRef *SubresourceReference `json:"scaleRef"` ScaleRef SubresourceReference `json:"scaleRef"`
// MinReplicas is the lower limit for the number of pods that can be set by the autoscaler. // lower limit for the number of pods that can be set by the autoscaler, default 1.
MinReplicas int `json:"minReplicas"` MinReplicas *int `json:"minReplicas,omitempty"`
// MaxReplicas is the upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas. // upper limit for the number of pods that can be set by the autoscaler; cannot be smaller than MinReplicas.
MaxReplicas int `json:"maxReplicas"` MaxReplicas int `json:"maxReplicas"`
// Target is the target average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. // target average CPU utilization (represented as a percentage of requested CPU) over all the pods;
// Currently two types of resources are supported: "cpu" and "memory". // if not specified it defaults to the target CPU utilization at 80% of the requested resources.
Target ResourceConsumption `json:"target"` CPUUtilization *CPUTargetUtilization `json:"cpuUtilization,omitempty"`
} }
// HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler // current status of a horizontal pod autoscaler
type HorizontalPodAutoscalerStatus struct { type HorizontalPodAutoscalerStatus struct {
// CurrentReplicas is the number of replicas of pods managed by this autoscaler. // most recent generation observed by this autoscaler.
ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
// last time the HorizontalPodAutoscaler scaled the number of pods;
// used by the autoscaler to control how often the number of pods is changed.
LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty"`
// current number of replicas of pods managed by this autoscaler.
CurrentReplicas int `json:"currentReplicas"` CurrentReplicas int `json:"currentReplicas"`
// DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. // desired number of replicas of pods managed by this autoscaler.
DesiredReplicas int `json:"desiredReplicas"` DesiredReplicas int `json:"desiredReplicas"`
// CurrentConsumption is the current average consumption of the given resource that the autoscaler will // current average CPU utilization over all pods, represented as a percentage of requested CPU,
// try to maintain by adjusting the desired number of pods. // e.g. 70 means that an average pod is using now 70% of its requested CPU.
// Two types of resources are supported: "cpu" and "memory". CurrentCPUUtilizationPercentage *int `json:"currentCPUUtilizationPercentage,omitempty"`
CurrentConsumption *ResourceConsumption `json:"currentConsumption"`
// LastScaleTimestamp is the last time the HorizontalPodAutoscaler scaled the number of pods.
// This is used by the autoscaler to controll how often the number of pods is changed.
LastScaleTimestamp *unversioned.Time `json:"lastScaleTimestamp,omitempty"`
} }
// HorizontalPodAutoscaler represents the configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
// Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
v1.ObjectMeta `json:"metadata,omitempty"` v1.ObjectMeta `json:"metadata,omitempty"`
// Spec defines the behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"` Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"`
// Status represents the current information about the autoscaler. // current information about the autoscaler.
Status HorizontalPodAutoscalerStatus `json:"status,omitempty"` Status HorizontalPodAutoscalerStatus `json:"status,omitempty"`
} }
// HorizontalPodAutoscalerList is a list of HorizontalPodAutoscalers. // list of horizontal pod autoscaler objects.
type HorizontalPodAutoscalerList struct { type HorizontalPodAutoscalerList struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
unversioned.ListMeta `json:"metadata,omitempty"` unversioned.ListMeta `json:"metadata,omitempty"`
// Items is the list of HorizontalPodAutoscalers. // list of horizontal pod autoscaler objects.
Items []HorizontalPodAutoscaler `json:"items"` Items []HorizontalPodAutoscaler `json:"items"`
} }
......
pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
View file @ f3e0bb0d
...@@ -37,6 +37,14 @@ func (APIVersion) SwaggerDoc() map[string]string { ...@@ -37,6 +37,14 @@ func (APIVersion) SwaggerDoc() map[string]string {
return map_APIVersion return map_APIVersion
} }
var map_CPUTargetUtilization = map[string]string{
"targetPercentage": "fraction of the requested CPU that should be utilized/used, e.g. 70 means that 70% of the requested CPU should be in use.",
}
func (CPUTargetUtilization) SwaggerDoc() map[string]string {
return map_CPUTargetUtilization
}
var map_ClusterAutoscaler = map[string]string{ var map_ClusterAutoscaler = map[string]string{
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata For now (experimental api) it is required that the name is set to \"ClusterAutoscaler\" and namespace is \"default\".", "metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata For now (experimental api) it is required that the name is set to \"ClusterAutoscaler\" and namespace is \"default\".",
"spec": "Spec defines the desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", "spec": "Spec defines the desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status",
...@@ -182,10 +190,10 @@ func (HTTPIngressRuleValue) SwaggerDoc() map[string]string { ...@@ -182,10 +190,10 @@ func (HTTPIngressRuleValue) SwaggerDoc() map[string]string {
} }
var map_HorizontalPodAutoscaler = map[string]string{ var map_HorizontalPodAutoscaler = map[string]string{
"": "HorizontalPodAutoscaler represents the configuration of a horizontal pod autoscaler.", "": "configuration of a horizontal pod autoscaler.",
"metadata": "Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", "metadata": "Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
"spec": "Spec defines the behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.", "spec": "behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.",
"status": "Status represents the current information about the autoscaler.", "status": "current information about the autoscaler.",
} }
func (HorizontalPodAutoscaler) SwaggerDoc() map[string]string { func (HorizontalPodAutoscaler) SwaggerDoc() map[string]string {
...@@ -193,9 +201,9 @@ func (HorizontalPodAutoscaler) SwaggerDoc() map[string]string { ...@@ -193,9 +201,9 @@ func (HorizontalPodAutoscaler) SwaggerDoc() map[string]string {
} }
var map_HorizontalPodAutoscalerList = map[string]string{ var map_HorizontalPodAutoscalerList = map[string]string{
"": "HorizontalPodAutoscalerList is a list of HorizontalPodAutoscalers.", "": "list of horizontal pod autoscaler objects.",
"metadata": "Standard list metadata.", "metadata": "Standard list metadata.",
"items": "Items is the list of HorizontalPodAutoscalers.", "items": "list of horizontal pod autoscaler objects.",
} }
func (HorizontalPodAutoscalerList) SwaggerDoc() map[string]string { func (HorizontalPodAutoscalerList) SwaggerDoc() map[string]string {
...@@ -203,11 +211,11 @@ func (HorizontalPodAutoscalerList) SwaggerDoc() map[string]string { ...@@ -203,11 +211,11 @@ func (HorizontalPodAutoscalerList) SwaggerDoc() map[string]string {
} }
var map_HorizontalPodAutoscalerSpec = map[string]string{ var map_HorizontalPodAutoscalerSpec = map[string]string{
"": "HorizontalPodAutoscalerSpec is the specification of a horizontal pod autoscaler.", "": "specification of a horizontal pod autoscaler.",
"scaleRef": "ScaleRef is a reference to Scale subresource. HorizontalPodAutoscaler will learn the current resource consumption from its status, and will set the desired number of pods by modyfying its spec.", "scaleRef": "reference to Scale subresource; horizontal pod autoscaler will learn the current resource consumption from its status, and will set the desired number of pods by modifying its spec.",
"minReplicas": "MinReplicas is the lower limit for the number of pods that can be set by the autoscaler.", "minReplicas": "lower limit for the number of pods that can be set by the autoscaler, default 1.",
"maxReplicas": "MaxReplicas is the upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas.", "maxReplicas": "upper limit for the number of pods that can be set by the autoscaler; cannot be smaller than MinReplicas.",
"target": "Target is the target average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. Currently two types of resources are supported: \"cpu\" and \"memory\".", "cpuUtilization": "target average CPU utilization (represented as a percentage of requested CPU) over all the pods; if not specified it defaults to the target CPU utilization at 80% of the requested resources.",
} }
func (HorizontalPodAutoscalerSpec) SwaggerDoc() map[string]string { func (HorizontalPodAutoscalerSpec) SwaggerDoc() map[string]string {
...@@ -215,11 +223,12 @@ func (HorizontalPodAutoscalerSpec) SwaggerDoc() map[string]string { ...@@ -215,11 +223,12 @@ func (HorizontalPodAutoscalerSpec) SwaggerDoc() map[string]string {
} }
var map_HorizontalPodAutoscalerStatus = map[string]string{ var map_HorizontalPodAutoscalerStatus = map[string]string{
"": "HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler", "": "current status of a horizontal pod autoscaler",
"currentReplicas": "CurrentReplicas is the number of replicas of pods managed by this autoscaler.", "observedGeneration": "most recent generation observed by this autoscaler.",
"desiredReplicas": "DesiredReplicas is the desired number of replicas of pods managed by this autoscaler.", "lastScaleTime": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.",
"currentConsumption": "CurrentConsumption is the current average consumption of the given resource that the autoscaler will try to maintain by adjusting the desired number of pods. Two types of resources are supported: \"cpu\" and \"memory\".", "currentReplicas": "current number of replicas of pods managed by this autoscaler.",
"lastScaleTimestamp": "LastScaleTimestamp is the last time the HorizontalPodAutoscaler scaled the number of pods. This is used by the autoscaler to controll how often the number of pods is changed.", "desiredReplicas": "desired number of replicas of pods managed by this autoscaler.",
"currentCPUUtilizationPercentage": "current average CPU utilization over all pods, represented as a percentage of requested CPU, e.g. 70 means that an average pod is using now 70% of its requested CPU.",
} }
func (HorizontalPodAutoscalerStatus) SwaggerDoc() map[string]string { func (HorizontalPodAutoscalerStatus) SwaggerDoc() map[string]string {
...@@ -392,16 +401,6 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string { ...@@ -392,16 +401,6 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string {
return map_ReplicationControllerDummy return map_ReplicationControllerDummy
} }
var map_ResourceConsumption = map[string]string{
"": "ResourceConsumption is an object for specifying average resource consumption of a particular resource.",
"resource": "Resource specifies either the name of the target resource when present in the spec, or the name of the observed resource when present in the status.",
"quantity": "Quantity specifies either the target average consumption of the resource when present in the spec, or the observed average consumption when present in the status.",
}
func (ResourceConsumption) SwaggerDoc() map[string]string {
return map_ResourceConsumption
}
var map_RollingUpdateDeployment = map[string]string{ var map_RollingUpdateDeployment = map[string]string{
"": "Spec to control the desired behavior of rolling update.", "": "Spec to control the desired behavior of rolling update.",
"maxUnavailable": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.", "maxUnavailable": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.",
...@@ -414,10 +413,10 @@ func (RollingUpdateDeployment) SwaggerDoc() map[string]string { ...@@ -414,10 +413,10 @@ func (RollingUpdateDeployment) SwaggerDoc() map[string]string {
} }
var map_Scale = map[string]string{ var map_Scale = map[string]string{
"": "Scale subresource, applicable to ReplicationControllers and (in future) Deployment.", "": "represents a scaling request for a resource.",
"metadata": "Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.", "metadata": "Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.",
"spec": "Spec defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.", "spec": "defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.",
"status": "Status represents the current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only.", "status": "current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only.",
} }
func (Scale) SwaggerDoc() map[string]string { func (Scale) SwaggerDoc() map[string]string {
...@@ -425,8 +424,8 @@ func (Scale) SwaggerDoc() map[string]string { ...@@ -425,8 +424,8 @@ func (Scale) SwaggerDoc() map[string]string {
} }
var map_ScaleSpec = map[string]string{ var map_ScaleSpec = map[string]string{
"": "ScaleSpec describes the attributes a Scale subresource", "": "describes the attributes of a scale subresource",
"replicas": "Replicas is the number of desired replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller\"", "replicas": "desired number of instances for the scaled object.",
} }
func (ScaleSpec) SwaggerDoc() map[string]string { func (ScaleSpec) SwaggerDoc() map[string]string {
...@@ -434,9 +433,9 @@ func (ScaleSpec) SwaggerDoc() map[string]string { ...@@ -434,9 +433,9 @@ func (ScaleSpec) SwaggerDoc() map[string]string {
} }
var map_ScaleStatus = map[string]string{ var map_ScaleStatus = map[string]string{
"": "ScaleStatus represents the current status of a Scale subresource.", "": "represents the current status of a scale subresource.",
"replicas": "Replicas is the number of actual replicas. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller", "replicas": "actual number of observed instances of the scaled object.",
"selector": "Selector is a label query over pods that should match the replicas count. If it is empty, it is defaulted to labels on Pod template; More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors", "selector": "label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors",
} }
func (ScaleStatus) SwaggerDoc() map[string]string { func (ScaleStatus) SwaggerDoc() map[string]string {
......
pkg/apis/extensions/validation/validation.go
View file @ f3e0bb0d
...@@ -51,37 +51,19 @@ func ValidateHorizontalPodAutoscalerName(name string, prefix bool) (bool, string ...@@ -51,37 +51,19 @@ func ValidateHorizontalPodAutoscalerName(name string, prefix bool) (bool, string
return apivalidation.ValidateReplicationControllerName(name, prefix) return apivalidation.ValidateReplicationControllerName(name, prefix)
} }
func validateResourceConsumption(consumption *extensions.ResourceConsumption, fieldName string) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}
resource := consumption.Resource.String()
if resource != string(api.ResourceMemory) && resource != string(api.ResourceCPU) {
allErrs = append(allErrs, errs.NewFieldInvalid(fieldName+".resource", resource, "resource not supported by autoscaler"))
}
quantity := consumption.Quantity.Value()
if quantity < 0 {
allErrs = append(allErrs, errs.NewFieldInvalid(fieldName+".quantity", quantity, "must be non-negative"))
}
return allErrs
}
func validateHorizontalPodAutoscalerSpec(autoscaler extensions.HorizontalPodAutoscalerSpec) errs.ValidationErrorList { func validateHorizontalPodAutoscalerSpec(autoscaler extensions.HorizontalPodAutoscalerSpec) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{} allErrs := errs.ValidationErrorList{}
if autoscaler.MinReplicas < 0 { if autoscaler.MinReplicas != nil && *autoscaler.MinReplicas < 1 {
allErrs = append(allErrs, errs.NewFieldInvalid("minReplicas", autoscaler.MinReplicas, isNegativeErrorMsg)) allErrs = append(allErrs, errs.NewFieldInvalid("minReplicas", autoscaler.MinReplicas, `must be bigger or equal to 1`))
}
if autoscaler.MaxReplicas < autoscaler.MinReplicas {
allErrs = append(allErrs, errs.NewFieldInvalid("maxReplicas", autoscaler.MaxReplicas, `must be bigger or equal to minReplicas`))
} }
if autoscaler.ScaleRef == nil { if autoscaler.MaxReplicas < 1 {
allErrs = append(allErrs, errs.NewFieldRequired("scaleRef")) allErrs = append(allErrs, errs.NewFieldInvalid("maxReplicas", autoscaler.MaxReplicas, `must be bigger or equal to 1`))
} }
resource := autoscaler.Target.Resource.String() if autoscaler.MinReplicas != nil && autoscaler.MaxReplicas < *autoscaler.MinReplicas {
if resource != string(api.ResourceMemory) && resource != string(api.ResourceCPU) { allErrs = append(allErrs, errs.NewFieldInvalid("maxReplicas", autoscaler.MaxReplicas, `must be bigger or equal to minReplicas`))
allErrs = append(allErrs, errs.NewFieldInvalid("target.resource", resource, "resource not supported by autoscaler"))
} }
quantity := autoscaler.Target.Quantity.Value() if autoscaler.CPUUtilization != nil && autoscaler.CPUUtilization.TargetPercentage < 1 {
if quantity < 0 { allErrs = append(allErrs, errs.NewFieldInvalid("cpuUtilization.targetPercentage", autoscaler.CPUUtilization.TargetPercentage, isNegativeErrorMsg))
allErrs = append(allErrs, errs.NewFieldInvalid("target.quantity", quantity, isNegativeErrorMsg))
} }
return allErrs return allErrs
} }
...@@ -107,9 +89,6 @@ func ValidateHorizontalPodAutoscalerStatusUpdate(controller, oldController *exte ...@@ -107,9 +89,6 @@ func ValidateHorizontalPodAutoscalerStatusUpdate(controller, oldController *exte
status := controller.Status status := controller.Status
allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.CurrentReplicas), "currentReplicas")...) allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.CurrentReplicas), "currentReplicas")...)
allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.DesiredReplicas), "desiredReplicas")...) allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.DesiredReplicas), "desiredReplicas")...)
if status.CurrentConsumption != nil {
allErrs = append(allErrs, validateResourceConsumption(status.CurrentConsumption, "currentConsumption")...)
}
return allErrs return allErrs
} }
......
pkg/apis/extensions/validation/validation_test.go
View file @ f3e0bb0d
...@@ -22,7 +22,6 @@ import ( ...@@ -22,7 +22,6 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
errors "k8s.io/kubernetes/pkg/util/fielderrors" errors "k8s.io/kubernetes/pkg/util/fielderrors"
...@@ -36,87 +35,73 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { ...@@ -36,87 +35,73 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: 1, MinReplicas: newInt(1),
MaxReplicas: 5, MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
}, },
}, },
} {
for _, successCase := range successCases {
if errs := ValidateHorizontalPodAutoscaler(&successCase); len(errs) != 0 {
t.Errorf("expected success: %v", errs)
}
}
errorCases := map[string]extensions.HorizontalPodAutoscaler{
"must be non-negative": {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "myautoscaler", Name: "myautoscaler",
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: -1, MinReplicas: newInt(1),
MaxReplicas: 5, MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
}, },
}, },
"must be bigger or equal to minReplicas": { }
for _, successCase := range successCases {
if errs := ValidateHorizontalPodAutoscaler(&successCase); len(errs) != 0 {
t.Errorf("expected success: %v", errs)
}
}
errorCases := map[string]extensions.HorizontalPodAutoscaler{
"must be bigger or equal to 1": {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "myautoscaler", Name: "myautoscaler",
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: 7, MinReplicas: newInt(-1),
MaxReplicas: 5, MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
}, },
}, },
"invalid value": { "must be bigger or equal to minReplicas": {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "myautoscaler", Name: "myautoscaler",
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: 1, MinReplicas: newInt(7),
MaxReplicas: 5, MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("-0.8")},
}, },
}, },
"resource not supported": { "must be non-negative": {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "myautoscaler", Name: "myautoscaler",
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: 1, MinReplicas: newInt(1),
MaxReplicas: 5, MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceName("NotSupportedResource"), Quantity: resource.MustParse("0.8")}, CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: -70},
},
},
"required value": {
ObjectMeta: api.ObjectMeta{
Name: "myautoscaler",
Namespace: api.NamespaceDefault,
},
Spec: extensions.HorizontalPodAutoscalerSpec{
MinReplicas: 1,
MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
}, },
}, },
} }
...@@ -1147,3 +1132,9 @@ func TestValidateClusterAutoscaler(t *testing.T) { ...@@ -1147,3 +1132,9 @@ func TestValidateClusterAutoscaler(t *testing.T) {
} }
} }
} }
func newInt(val int) *int {
p := new(int)
*p = val
return p
}
pkg/controller/podautoscaler/horizontal.go
View file @ f3e0bb0d
...@@ -68,6 +68,31 @@ func (a *HorizontalController) Run(syncPeriod time.Duration) { ...@@ -68,6 +68,31 @@ func (a *HorizontalController) Run(syncPeriod time.Duration) {
}, syncPeriod, util.NeverStop) }, syncPeriod, util.NeverStop)
} }
func (a *HorizontalController) computeReplicasForCPUUtilization(hpa extensions.HorizontalPodAutoscaler,
scale *extensions.Scale) (int, *int, error) {
if hpa.Spec.CPUUtilization == nil {
// If CPUTarget is not specified than we should return some default values.
// Since we always take maximum number of replicas from all policies it is safe
// to just return 0.
return 0, nil, nil
}
currentReplicas := scale.Status.Replicas
currentUtilization, err := a.metricsClient.GetCPUUtilization(hpa.Spec.ScaleRef.Namespace, scale.Status.Selector)
// TODO: what to do on partial errors (like metrics obtained for 75% of pods).
if err != nil {
a.eventRecorder.Event(&hpa, "FailedGetMetrics", err.Error())
return 0, nil, fmt.Errorf("failed to get cpu utilization: %v", err)
}
usageRatio := float64(*currentUtilization) / float64(hpa.Spec.CPUUtilization.TargetPercentage)
if math.Abs(1.0-usageRatio) > tolerance {
return int(math.Ceil(usageRatio * float64(currentReplicas))), currentUtilization, nil
} else {
return currentReplicas, currentUtilization, nil
}
}
func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodAutoscaler) error { func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodAutoscaler) error {
reference := fmt.Sprintf("%s/%s/%s", hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Name) reference := fmt.Sprintf("%s/%s/%s", hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Name)
...@@ -77,24 +102,18 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA ...@@ -77,24 +102,18 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
return fmt.Errorf("failed to query scale subresource for %s: %v", reference, err) return fmt.Errorf("failed to query scale subresource for %s: %v", reference, err)
} }
currentReplicas := scale.Status.Replicas currentReplicas := scale.Status.Replicas
currentConsumption, err := a.metricsClient.
ResourceConsumption(hpa.Spec.ScaleRef.Namespace).
Get(hpa.Spec.Target.Resource, scale.Status.Selector)
// TODO: what to do on partial errors (like metrics obtained for 75% of pods). desiredReplicas, currentUtilization, err := a.computeReplicasForCPUUtilization(hpa, scale)
if err != nil { if err != nil {
a.eventRecorder.Event(&hpa, "FailedGetMetrics", err.Error()) a.eventRecorder.Event(&hpa, "FailedComputeReplicas", err.Error())
return fmt.Errorf("failed to get metrics for %s: %v", reference, err) return fmt.Errorf("failed to compute desired number of replicas based on CPU utilization for %s: %v", reference, err)
} }
usageRatio := float64(currentConsumption.Quantity.MilliValue()) / float64(hpa.Spec.Target.Quantity.MilliValue()) if hpa.Spec.MinReplicas != nil && desiredReplicas < *hpa.Spec.MinReplicas {
desiredReplicas := int(math.Ceil(usageRatio * float64(currentReplicas))) desiredReplicas = *hpa.Spec.MinReplicas
if desiredReplicas < hpa.Spec.MinReplicas {
desiredReplicas = hpa.Spec.MinReplicas
} }
// TODO: remove when pod ideling is done. // TODO: remove when pod idling is done.
if desiredReplicas == 0 { if desiredReplicas == 0 {
desiredReplicas = 1 desiredReplicas = 1
} }
...@@ -108,17 +127,17 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA ...@@ -108,17 +127,17 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
if desiredReplicas != currentReplicas { if desiredReplicas != currentReplicas {
// 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 &&
(hpa.Status.LastScaleTimestamp == nil || (hpa.Status.LastScaleTime == nil ||
hpa.Status.LastScaleTimestamp.Add(downscaleForbiddenWindow).Before(now)) { hpa.Status.LastScaleTime.Add(downscaleForbiddenWindow).Before(now)) {
rescale = true rescale = true
} }
// 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 &&
(hpa.Status.LastScaleTimestamp == nil || (hpa.Status.LastScaleTime == nil ||
hpa.Status.LastScaleTimestamp.Add(upscaleForbiddenWindow).Before(now)) { hpa.Status.LastScaleTime.Add(upscaleForbiddenWindow).Before(now)) {
rescale = true rescale = true
} }
} }
...@@ -131,20 +150,20 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA ...@@ -131,20 +150,20 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
return fmt.Errorf("failed to rescale %s: %v", reference, err) return fmt.Errorf("failed to rescale %s: %v", reference, err)
} }
a.eventRecorder.Eventf(&hpa, "SuccessfulRescale", "New size: %d", desiredReplicas) a.eventRecorder.Eventf(&hpa, "SuccessfulRescale", "New size: %d", desiredReplicas)
glog.Infof("Successfull rescale of %s, old size: %d, new size: %d, usage ratio: %f", glog.Infof("Successfull rescale of %s, old size: %d, new size: %d",
hpa.Name, currentReplicas, desiredReplicas, usageRatio) hpa.Name, currentReplicas, desiredReplicas)
} else { } else {
desiredReplicas = currentReplicas desiredReplicas = currentReplicas
} }
hpa.Status = extensions.HorizontalPodAutoscalerStatus{ hpa.Status = extensions.HorizontalPodAutoscalerStatus{
CurrentReplicas: currentReplicas, CurrentReplicas: currentReplicas,
DesiredReplicas: desiredReplicas, DesiredReplicas: desiredReplicas,
CurrentConsumption: currentConsumption, CurrentCPUUtilizationPercentage: currentUtilization,
} }
if rescale { if rescale {
now := unversioned.NewTime(now) now := unversioned.NewTime(now)
hpa.Status.LastScaleTimestamp = &now hpa.Status.LastScaleTime = &now
} }
_, err = a.client.Extensions().HorizontalPodAutoscalers(hpa.Namespace).UpdateStatus(&hpa) _, err = a.client.Extensions().HorizontalPodAutoscalers(hpa.Namespace).UpdateStatus(&hpa)
......
pkg/controller/podautoscaler/horizontal_test.go
View file @ f3e0bb0d
...@@ -58,12 +58,13 @@ type testCase struct { ...@@ -58,12 +58,13 @@ type testCase struct {
maxReplicas int maxReplicas int
initialReplicas int initialReplicas int
desiredReplicas int desiredReplicas int
targetResource api.ResourceName // CPU target utilization as a percentage of the requested resources.
targetLevel resource.Quantity CPUTarget int
reportedLevels []uint64 reportedLevels []uint64
scaleUpdated bool reportedCPURequests []resource.Quantity
eventCreated bool scaleUpdated bool
verifyEvents bool eventCreated bool
verifyEvents bool
} }
func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
...@@ -86,19 +87,21 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { ...@@ -86,19 +87,21 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
SelfLink: "experimental/v1/namespaces/" + namespace + "/horizontalpodautoscalers/" + hpaName, SelfLink: "experimental/v1/namespaces/" + namespace + "/horizontalpodautoscalers/" + hpaName,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Kind: "replicationController", Kind: "replicationController",
Name: rcName, Name: rcName,
Namespace: namespace, Namespace: namespace,
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: tc.minReplicas, MinReplicas: &tc.minReplicas,
MaxReplicas: tc.maxReplicas, MaxReplicas: tc.maxReplicas,
Target: extensions.ResourceConsumption{Resource: tc.targetResource, Quantity: tc.targetLevel},
}, },
}, },
}, },
} }
if tc.CPUTarget > 0.0 {
obj.Items[0].Spec.CPUUtilization = &extensions.CPUTargetUtilization{TargetPercentage: tc.CPUTarget}
}
return true, obj, nil return true, obj, nil
}) })
...@@ -121,7 +124,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { ...@@ -121,7 +124,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
fakeClient.AddReactor("list", "pods", func(action testclient.Action) (handled bool, ret runtime.Object, err error) { fakeClient.AddReactor("list", "pods", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
obj := &api.PodList{} obj := &api.PodList{}
for i := 0; i < tc.initialReplicas; i++ { for i := 0; i < len(tc.reportedCPURequests); i++ {
podName := fmt.Sprintf("%s-%d", podNamePrefix, i) podName := fmt.Sprintf("%s-%d", podNamePrefix, i)
pod := api.Pod{ pod := api.Pod{
Status: api.PodStatus{ Status: api.PodStatus{
...@@ -134,6 +137,17 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { ...@@ -134,6 +137,17 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
"name": podNamePrefix, "name": podNamePrefix,
}, },
}, },
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceCPU: tc.reportedCPURequests[i],
},
},
},
},
},
} }
obj.Items = append(obj.Items, pod) obj.Items = append(obj.Items, pod)
} }
...@@ -202,160 +216,148 @@ func (tc *testCase) runTest(t *testing.T) { ...@@ -202,160 +216,148 @@ func (tc *testCase) runTest(t *testing.T) {
tc.verifyResults(t) tc.verifyResults(t)
} }
func TestCPU(t *testing.T) {
tc := testCase{
minReplicas: 1,
maxReplicas: 5,
initialReplicas: 1,
desiredReplicas: 2,
targetResource: api.ResourceCPU,
targetLevel: resource.MustParse("0.1"),
reportedLevels: []uint64{200},
}
tc.runTest(t)
}
func TestMemory(t *testing.T) {
tc := testCase{
minReplicas: 1,
maxReplicas: 5,
initialReplicas: 1,
desiredReplicas: 2,
targetResource: api.ResourceMemory,
targetLevel: resource.MustParse("1k"),
reportedLevels: []uint64{2000},
}
tc.runTest(t)
}
func TestScaleUp(t *testing.T) { func TestScaleUp(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 6, maxReplicas: 6,
initialReplicas: 3, initialReplicas: 3,
desiredReplicas: 5, desiredReplicas: 5,
targetResource: api.ResourceMemory, CPUTarget: 30,
targetLevel: resource.MustParse("3k"), reportedLevels: []uint64{300, 500, 700},
reportedLevels: []uint64{3000, 5000, 7000}, reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestScaleDown(t *testing.T) { func TestScaleDown(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 6, maxReplicas: 6,
initialReplicas: 5, initialReplicas: 5,
desiredReplicas: 3, desiredReplicas: 3,
targetResource: api.ResourceCPU, CPUTarget: 50,
targetLevel: resource.MustParse("0.5"), reportedLevels: []uint64{100, 300, 500, 250, 250},
reportedLevels: []uint64{100, 300, 500, 250, 250}, reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestTolerance(t *testing.T) { func TestTolerance(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 1, minReplicas: 1,
maxReplicas: 5, maxReplicas: 5,
initialReplicas: 3, initialReplicas: 3,
desiredReplicas: 3, desiredReplicas: 3,
targetResource: api.ResourceMemory, CPUTarget: 100,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{1010, 1030, 1020},
reportedLevels: []uint64{1010, 1030, 1020}, reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestMinReplicas(t *testing.T) { func TestMinReplicas(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 5, maxReplicas: 5,
initialReplicas: 3, initialReplicas: 3,
desiredReplicas: 2, desiredReplicas: 2,
targetResource: api.ResourceMemory, CPUTarget: 90,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{10, 95, 10},
reportedLevels: []uint64{10, 95, 10}, reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestMaxReplicas(t *testing.T) { func TestMaxReplicas(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 5, maxReplicas: 5,
initialReplicas: 3, initialReplicas: 3,
desiredReplicas: 5, desiredReplicas: 5,
targetResource: api.ResourceMemory, CPUTarget: 90,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{8000, 9500, 1000},
reportedLevels: []uint64{8000, 9500, 1000}, reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestSuperfluousMetrics(t *testing.T) { func TestSuperfluousMetrics(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 6, maxReplicas: 6,
initialReplicas: 4, initialReplicas: 4,
desiredReplicas: 4, desiredReplicas: 4,
targetResource: api.ResourceMemory, CPUTarget: 100,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{4000, 9500, 3000, 7000, 3200, 2000},
reportedLevels: []uint64{4000, 9500, 3000, 7000, 3200, 2000}, reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestMissingMetrics(t *testing.T) { func TestMissingMetrics(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 6, maxReplicas: 6,
initialReplicas: 4, initialReplicas: 4,
desiredReplicas: 4, desiredReplicas: 4,
targetResource: api.ResourceMemory, CPUTarget: 100,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{400, 95},
reportedLevels: []uint64{400, 95}, reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestEmptyMetrics(t *testing.T) { func TestEmptyMetrics(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 2, minReplicas: 2,
maxReplicas: 6, maxReplicas: 6,
initialReplicas: 4, initialReplicas: 4,
desiredReplicas: 4, desiredReplicas: 4,
targetResource: api.ResourceMemory, CPUTarget: 100,
targetLevel: resource.MustParse("1k"), reportedLevels: []uint64{},
reportedLevels: []uint64{}, reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
} }
tc.runTest(t) tc.runTest(t)
} }
func TestEventCreated(t *testing.T) { func TestEmptyCPURequest(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 1, minReplicas: 1,
maxReplicas: 5, maxReplicas: 5,
initialReplicas: 1, initialReplicas: 1,
desiredReplicas: 2, desiredReplicas: 1,
targetResource: api.ResourceCPU, CPUTarget: 100,
targetLevel: resource.MustParse("0.1"),
reportedLevels: []uint64{200}, reportedLevels: []uint64{200},
verifyEvents: true, }
tc.runTest(t)
}
func TestEventCreated(t *testing.T) {
tc := testCase{
minReplicas: 1,
maxReplicas: 5,
initialReplicas: 1,
desiredReplicas: 2,
CPUTarget: 50,
reportedLevels: []uint64{200},
reportedCPURequests: []resource.Quantity{resource.MustParse("0.2")},
verifyEvents: true,
} }
tc.runTest(t) tc.runTest(t)
} }
func TestEventNotCreated(t *testing.T) { func TestEventNotCreated(t *testing.T) {
tc := testCase{ tc := testCase{
minReplicas: 1, minReplicas: 1,
maxReplicas: 5, maxReplicas: 5,
initialReplicas: 2, initialReplicas: 2,
desiredReplicas: 2, desiredReplicas: 2,
targetResource: api.ResourceCPU, CPUTarget: 50,
targetLevel: resource.MustParse("0.2"), reportedLevels: []uint64{200, 200},
reportedLevels: []uint64{200, 200}, reportedCPURequests: []resource.Quantity{resource.MustParse("0.4"), resource.MustParse("0.4")},
verifyEvents: true, verifyEvents: true,
} }
tc.runTest(t) tc.runTest(t)
} }
// TODO: add more tests
pkg/controller/podautoscaler/metrics/metrics_client.go
View file @ f3e0bb0d
...@@ -25,7 +25,6 @@ import ( ...@@ -25,7 +25,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/apis/extensions"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
...@@ -40,85 +39,110 @@ const ( ...@@ -40,85 +39,110 @@ const (
var heapsterQueryStart = -5 * time.Minute var heapsterQueryStart = -5 * time.Minute
// An interface for getting metrics for pods. // MetricsClient is an interface for getting metrics for pods.
type MetricsClient interface { type MetricsClient interface {
ResourceConsumption(namespace string) ResourceConsumptionClient // GetCPUUtilization returns average utilization over all pods
// represented as a percent of requested CPU, e.g. 70 means that
// an average pod uses 70% of the requested CPU.
GetCPUUtilization(namespace string, selector map[string]string) (*int, error)
} }
type ResourceConsumptionClient interface { // ResourceConsumption specifies consumption of a particular resource.
// Gets average resource consumption for pods under the given selector. type ResourceConsumption struct {
Get(resourceName api.ResourceName, selector map[string]string) (*extensions.ResourceConsumption, error) Resource api.ResourceName
Quantity resource.Quantity
} }
// Aggregates results into ResourceConsumption. Also returns number of // Aggregates results into ResourceConsumption. Also returns number of
// pods included in the aggregation. // pods included in the aggregation.
type metricAggregator func(heapster.MetricResultList) (extensions.ResourceConsumption, int) type metricAggregator func(heapster.MetricResultList) (ResourceConsumption, int)
type metricDefinition struct { type metricDefinition struct {
name string name string
aggregator metricAggregator aggregator metricAggregator
} }
// Heapster-based implementation of MetricsClient // HeapsterMetricsClient is Heapster-based implementation of MetricsClient
type HeapsterMetricsClient struct { type HeapsterMetricsClient struct {
client client.Interface
}
type HeapsterResourceConsumptionClient struct {
namespace string
client client.Interface client client.Interface
resourceDefinitions map[api.ResourceName]metricDefinition resourceDefinitions map[api.ResourceName]metricDefinition
} }
func NewHeapsterMetricsClient(client client.Interface) *HeapsterMetricsClient {
return &HeapsterMetricsClient{client: client}
}
var heapsterMetricDefinitions = map[api.ResourceName]metricDefinition{ var heapsterMetricDefinitions = map[api.ResourceName]metricDefinition{
api.ResourceCPU: {"cpu-usage", api.ResourceCPU: {"cpu-usage",
func(metrics heapster.MetricResultList) (extensions.ResourceConsumption, int) { func(metrics heapster.MetricResultList) (ResourceConsumption, int) {
sum, count := calculateSumFromLatestSample(metrics) sum, count := calculateSumFromLatestSample(metrics)
value := "0" value := "0"
if count > 0 { if count > 0 {
// assumes that cpu usage is in millis // assumes that cpu usage is in millis
value = fmt.Sprintf("%dm", sum/uint64(count)) value = fmt.Sprintf("%dm", sum/uint64(count))
} }
return extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(value)}, count return ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(value)}, count
}}, }},
api.ResourceMemory: {"memory-usage", api.ResourceMemory: {"memory-usage",
func(metrics heapster.MetricResultList) (extensions.ResourceConsumption, int) { func(metrics heapster.MetricResultList) (ResourceConsumption, int) {
sum, count := calculateSumFromLatestSample(metrics) sum, count := calculateSumFromLatestSample(metrics)
value := int64(0) value := int64(0)
if count > 0 { if count > 0 {
value = int64(sum) / int64(count) value = int64(sum) / int64(count)
} }
return extensions.ResourceConsumption{Resource: api.ResourceMemory, Quantity: *resource.NewQuantity(value, resource.DecimalSI)}, count return ResourceConsumption{Resource: api.ResourceMemory, Quantity: *resource.NewQuantity(value, resource.DecimalSI)}, count
}}, }},
} }
func (h *HeapsterMetricsClient) ResourceConsumption(namespace string) ResourceConsumptionClient { // NewHeapsterMetricsClient returns a new instance of Heapster-based implementation of MetricsClient interface.
return &HeapsterResourceConsumptionClient{ func NewHeapsterMetricsClient(client client.Interface) *HeapsterMetricsClient {
namespace: namespace, return &HeapsterMetricsClient{
client: h.client, client: client,
resourceDefinitions: heapsterMetricDefinitions, resourceDefinitions: heapsterMetricDefinitions,
} }
} }
func (h *HeapsterResourceConsumptionClient) Get(resourceName api.ResourceName, selector map[string]string) (*extensions.ResourceConsumption, error) { func (h *HeapsterMetricsClient) GetCPUUtilization(namespace string, selector map[string]string) (*int, error) {
podList, err := h.client.Pods(h.namespace). consumption, request, err := h.GetResourceConsumptionAndRequest(api.ResourceCPU, namespace, selector)
if err != nil {
return nil, fmt.Errorf("failed to get CPU consumption and request: %v", err)
}
utilization := new(int)
*utilization = int(float64(consumption.Quantity.MilliValue()) / float64(request.MilliValue()) * 100)
return utilization, nil
}
func (h *HeapsterMetricsClient) GetResourceConsumptionAndRequest(resourceName api.ResourceName, namespace string, selector map[string]string) (consumption *ResourceConsumption, request *resource.Quantity, err error) {
podList, err := h.client.Pods(namespace).
List(labels.SelectorFromSet(labels.Set(selector)), fields.Everything()) List(labels.SelectorFromSet(labels.Set(selector)), fields.Everything())
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get pod list: %v", err) return nil, nil, fmt.Errorf("failed to get pod list: %v", err)
} }
podNames := []string{} podNames := []string{}
sum := resource.MustParse("0")
missing := false
for _, pod := range podList.Items { for _, pod := range podList.Items {
podNames = append(podNames, pod.Name) podNames = append(podNames, pod.Name)
for _, container := range pod.Spec.Containers {
containerRequest := container.Resources.Requests[resourceName]
if containerRequest.Amount != nil {
sum.Add(containerRequest)
} else {
missing = true
}
}
}
if missing || sum.Cmp(resource.MustParse("0")) == 0 {
return nil, nil, fmt.Errorf("some pods do not have request for %s", resourceName)
}
glog.Infof("Sum of %s requested: %v", resourceName, sum)
avg := resource.MustParse(fmt.Sprintf("%dm", sum.MilliValue()/int64(len(podList.Items))))
request = &avg
consumption, err = h.getForPods(resourceName, namespace, podNames)
if err != nil {
return nil, nil, err
} }
return h.getForPods(resourceName, podNames) return consumption, request, nil
} }
func (h *HeapsterResourceConsumptionClient) getForPods(resourceName api.ResourceName, podNames []string) (*extensions.ResourceConsumption, error) { func (h *HeapsterMetricsClient) getForPods(resourceName api.ResourceName, namespace string, podNames []string) (*ResourceConsumption, error) {
metricSpec, metricDefined := h.resourceDefinitions[resourceName] metricSpec, metricDefined := h.resourceDefinitions[resourceName]
if !metricDefined { if !metricDefined {
return nil, fmt.Errorf("heapster metric not defined for %v", resourceName) return nil, fmt.Errorf("heapster metric not defined for %v", resourceName)
...@@ -127,7 +151,7 @@ func (h *HeapsterResourceConsumptionClient) getForPods(resourceName api.Resource ...@@ -127,7 +151,7 @@ func (h *HeapsterResourceConsumptionClient) getForPods(resourceName api.Resource
startTime := now.Add(heapsterQueryStart) startTime := now.Add(heapsterQueryStart)
metricPath := fmt.Sprintf("/api/v1/model/namespaces/%s/pod-list/%s/metrics/%s", metricPath := fmt.Sprintf("/api/v1/model/namespaces/%s/pod-list/%s/metrics/%s",
h.namespace, namespace,
strings.Join(podNames, ","), strings.Join(podNames, ","),
metricSpec.name) metricSpec.name)
......
pkg/controller/podautoscaler/metrics/metrics_client_test.go
View file @ f3e0bb0d
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/latest" _ "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/api/resource"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/client/unversioned/testclient"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
...@@ -81,14 +81,25 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { ...@@ -81,14 +81,25 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
for i := 0; i < tc.replicas; i++ { for i := 0; i < tc.replicas; i++ {
podName := fmt.Sprintf("%s-%d", podNamePrefix, i) podName := fmt.Sprintf("%s-%d", podNamePrefix, i)
pod := api.Pod{ pod := api.Pod{
Status: api.PodStatus{
Phase: api.PodRunning,
},
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: podName, Name: podName,
Namespace: namespace, Namespace: namespace,
Labels: selector, Labels: selector,
}, },
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
tc.targetResource: resource.MustParse("10"),
},
},
},
},
},
Status: api.PodStatus{
Phase: api.PodRunning,
},
} }
obj.Items = append(obj.Items, pod) obj.Items = append(obj.Items, pod)
} }
...@@ -122,7 +133,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake { ...@@ -122,7 +133,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
return fakeClient return fakeClient
} }
func (tc *testCase) verifyResults(t *testing.T, val *extensions.ResourceConsumption, err error) { func (tc *testCase) verifyResults(t *testing.T, val *ResourceConsumption, err error) {
assert.Equal(t, tc.desiredError, err) assert.Equal(t, tc.desiredError, err)
if tc.desiredError != nil { if tc.desiredError != nil {
return return
...@@ -138,7 +149,7 @@ func (tc *testCase) verifyResults(t *testing.T, val *extensions.ResourceConsumpt ...@@ -138,7 +149,7 @@ func (tc *testCase) verifyResults(t *testing.T, val *extensions.ResourceConsumpt
func (tc *testCase) runTest(t *testing.T) { func (tc *testCase) runTest(t *testing.T) {
testClient := tc.prepareTestClient(t) testClient := tc.prepareTestClient(t)
metricsClient := NewHeapsterMetricsClient(testClient) metricsClient := NewHeapsterMetricsClient(testClient)
val, err := metricsClient.ResourceConsumption(tc.namespace).Get(tc.targetResource, tc.selector) val, _, err := metricsClient.GetResourceConsumptionAndRequest(tc.targetResource, tc.namespace, tc.selector)
tc.verifyResults(t, val, err) tc.verifyResults(t, val, err)
} }
...@@ -331,7 +342,7 @@ func TestCPUZeroReplicas(t *testing.T) { ...@@ -331,7 +342,7 @@ func TestCPUZeroReplicas(t *testing.T) {
tc := testCase{ tc := testCase{
replicas: 0, replicas: 0,
targetResource: api.ResourceCPU, targetResource: api.ResourceCPU,
desiredValue: 0, desiredError: fmt.Errorf("some pods do not have request for cpu"),
reportedMetricsPoints: [][]metricPoint{}, reportedMetricsPoints: [][]metricPoint{},
} }
tc.runTest(t) tc.runTest(t)
...@@ -341,7 +352,7 @@ func TestMemoryZeroReplicas(t *testing.T) { ...@@ -341,7 +352,7 @@ func TestMemoryZeroReplicas(t *testing.T) {
tc := testCase{ tc := testCase{
replicas: 0, replicas: 0,
targetResource: api.ResourceMemory, targetResource: api.ResourceMemory,
desiredValue: 0, desiredError: fmt.Errorf("some pods do not have request for memory"),
reportedMetricsPoints: [][]metricPoint{}, reportedMetricsPoints: [][]metricPoint{},
} }
tc.runTest(t) tc.runTest(t)
...@@ -366,3 +377,5 @@ func TestMemoryEmptyMetricsForOnePod(t *testing.T) { ...@@ -366,3 +377,5 @@ func TestMemoryEmptyMetricsForOnePod(t *testing.T) {
} }
tc.runTest(t) tc.runTest(t)
} }
// TODO: add proper tests for request
pkg/kubectl/describe.go
View file @ f3e0bb0d
...@@ -1250,17 +1250,14 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str ...@@ -1250,17 +1250,14 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str
hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Namespace,
hpa.Spec.ScaleRef.Name, hpa.Spec.ScaleRef.Name,
hpa.Spec.ScaleRef.Subresource) hpa.Spec.ScaleRef.Subresource)
fmt.Fprintf(out, "Target resource consumption:\t%s %s\n", if hpa.Spec.CPUUtilization != nil {
hpa.Spec.Target.Quantity.String(), fmt.Fprintf(out, "Target CPU utilization:\t%d%%\n", hpa.Spec.CPUUtilization.TargetPercentage)
hpa.Spec.Target.Resource) fmt.Fprintf(out, "Current CPU utilization:\t")
fmt.Fprintf(out, "Current resource consumption:\t") if hpa.Status.CurrentCPUUtilizationPercentage != nil {
fmt.Fprintf(out, "%d%%\n", *hpa.Status.CurrentCPUUtilizationPercentage)
if hpa.Status.CurrentConsumption != nil { } else {
fmt.Fprintf(out, "%s %s\n", fmt.Fprintf(out, "<not available>\n")
hpa.Status.CurrentConsumption.Quantity.String(), }
hpa.Status.CurrentConsumption.Resource)
} else {
fmt.Fprintf(out, "<not available>\n")
} }
fmt.Fprintf(out, "Min pods:\t%d\n", hpa.Spec.MinReplicas) fmt.Fprintf(out, "Min pods:\t%d\n", hpa.Spec.MinReplicas)
fmt.Fprintf(out, "Max pods:\t%d\n", hpa.Spec.MaxReplicas) fmt.Fprintf(out, "Max pods:\t%d\n", hpa.Spec.MaxReplicas)
......
pkg/kubectl/resource_printer.go
View file @ f3e0bb0d
...@@ -1388,11 +1388,13 @@ func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io. ...@@ -1388,11 +1388,13 @@ func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io.
hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Namespace,
hpa.Spec.ScaleRef.Name, hpa.Spec.ScaleRef.Name,
hpa.Spec.ScaleRef.Subresource) hpa.Spec.ScaleRef.Subresource)
target := fmt.Sprintf("%s %v", hpa.Spec.Target.Quantity.String(), hpa.Spec.Target.Resource) target := "<unknown>"
if hpa.Spec.CPUUtilization != nil {
target = fmt.Sprintf("%d%%", hpa.Spec.CPUUtilization.TargetPercentage)
}
current := "<waiting>" current := "<waiting>"
if hpa.Status.CurrentConsumption != nil { if hpa.Status.CurrentCPUUtilizationPercentage != nil {
current = fmt.Sprintf("%s %v", hpa.Status.CurrentConsumption.Quantity.String(), hpa.Status.CurrentConsumption.Resource) current = fmt.Sprintf("%d%%", *hpa.Status.CurrentCPUUtilizationPercentage)
} }
minPods := hpa.Spec.MinReplicas minPods := hpa.Spec.MinReplicas
maxPods := hpa.Spec.MaxReplicas maxPods := hpa.Spec.MaxReplicas
......
pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go
View file @ f3e0bb0d
...@@ -20,7 +20,6 @@ import ( ...@@ -20,7 +20,6 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
// Ensure that extensions/v1beta1 package is initialized. // Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
...@@ -44,12 +43,11 @@ func validNewHorizontalPodAutoscaler(name string) *extensions.HorizontalPodAutos ...@@ -44,12 +43,11 @@ func validNewHorizontalPodAutoscaler(name string) *extensions.HorizontalPodAutos
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: extensions.HorizontalPodAutoscalerSpec{ Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{ ScaleRef: extensions.SubresourceReference{
Subresource: "scale", Subresource: "scale",
}, },
MinReplicas: 1, MaxReplicas: 5,
MaxReplicas: 5, CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
}, },
} }
} }
......
test/e2e/horizontal_pod_autoscaling.go
View file @ f3e0bb0d
...@@ -17,10 +17,7 @@ limitations under the License. ...@@ -17,10 +17,7 @@ limitations under the License.
package e2e package e2e
import ( import (
"k8s.io/kubernetes/pkg/api" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/apis/extensions"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
) )
...@@ -34,7 +31,7 @@ var _ = Describe("Horizontal pod autoscaling", func() { ...@@ -34,7 +31,7 @@ var _ = Describe("Horizontal pod autoscaling", func() {
f := NewFramework("horizontal-pod-autoscaling") f := NewFramework("horizontal-pod-autoscaling")
// CPU tests // CPU tests
It("[Skipped][Autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: CPU)", func() { It("[Skipped] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 250, 0, 400, 100, f) rc = NewDynamicResourceConsumer("rc", 1, 250, 0, 400, 100, f)
defer rc.CleanUp() defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.1") createCPUHorizontalPodAutoscaler(rc, "0.1")
...@@ -43,7 +40,7 @@ var _ = Describe("Horizontal pod autoscaling", func() { ...@@ -43,7 +40,7 @@ var _ = Describe("Horizontal pod autoscaling", func() {
rc.WaitForReplicas(5) rc.WaitForReplicas(5)
}) })
It("[Skipped][Autoscaling Suite] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: CPU)", func() { It("[Skipped] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 5, 700, 0, 200, 100, f) rc = NewDynamicResourceConsumer("rc", 5, 700, 0, 200, 100, f)
defer rc.CleanUp() defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3") createCPUHorizontalPodAutoscaler(rc, "0.3")
...@@ -53,7 +50,7 @@ var _ = Describe("Horizontal pod autoscaling", func() { ...@@ -53,7 +50,7 @@ var _ = Describe("Horizontal pod autoscaling", func() {
}) })
// Memory tests // Memory tests
It("[Skipped][Autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: Memory)", func() { It("[Skipped] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 2200, 100, 2500, f) rc = NewDynamicResourceConsumer("rc", 1, 0, 2200, 100, 2500, f)
defer rc.CleanUp() defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "1000") createMemoryHorizontalPodAutoscaler(rc, "1000")
...@@ -62,7 +59,7 @@ var _ = Describe("Horizontal pod autoscaling", func() { ...@@ -62,7 +59,7 @@ var _ = Describe("Horizontal pod autoscaling", func() {
rc.WaitForReplicas(5) rc.WaitForReplicas(5)
}) })
It("[Skipped][Autoscaling Suite] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: Memory)", func() { It("[Skipped] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 5, 0, 2200, 100, 2500, f) rc = NewDynamicResourceConsumer("rc", 5, 0, 2200, 100, 2500, f)
defer rc.CleanUp() defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "1000") createMemoryHorizontalPodAutoscaler(rc, "1000")
...@@ -152,46 +149,12 @@ var _ = Describe("Horizontal pod autoscaling", func() { ...@@ -152,46 +149,12 @@ var _ = Describe("Horizontal pod autoscaling", func() {
}) })
func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) { func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) {
hpa := &extensions.HorizontalPodAutoscaler{ glog.Fatal("createCPUHorizontalPodAutoscaler not implemented!")
ObjectMeta: api.ObjectMeta{ // TODO: reimplemente e2e tests for the new API.
Name: rc.name,
Namespace: rc.framework.Namespace.Name,
},
Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{
Kind: kind,
Name: rc.name,
Namespace: rc.framework.Namespace.Name,
Subresource: subresource,
},
MinReplicas: 1,
MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(cpu)},
},
}
_, errHPA := rc.framework.Client.Extensions().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
expectNoError(errHPA)
} }
// argument memory is in megabytes // argument memory is in megabytes
func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) { func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) {
hpa := &extensions.HorizontalPodAutoscaler{ glog.Fatal("createMemoryHorizontalPodAutoscaler not implemented!")
ObjectMeta: api.ObjectMeta{ // TODO: reimplemente e2e tests for the new API.
Name: rc.name,
Namespace: rc.framework.Namespace.Name,
},
Spec: extensions.HorizontalPodAutoscalerSpec{
ScaleRef: &extensions.SubresourceReference{
Kind: kind,
Name: rc.name,
Namespace: rc.framework.Namespace.Name,
Subresource: subresource,
},
MinReplicas: 1,
MaxReplicas: 5,
Target: extensions.ResourceConsumption{Resource: api.ResourceMemory, Quantity: resource.MustParse(memory + "M")},
},
}
_, errHPA := rc.framework.Client.Extensions().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
expectNoError(errHPA)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment