github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15770 from piosz/hpa-e2e 

Migrate hpa e2e tests to the new API
pull/6/head
Piotr Szczesniak 2015-10-16 11:24:19 +02:00
parent f3e0bb0d41 52d8527761
commit b28339a1dd
3 changed files with 247 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
api/swagger-spec/v1beta1.json
View File

@ -2053,6 +2053,165 @@
}
]
},
{
"path": "/apis/extensions/v1beta1/namespaces/{namespace}/replicationcontrollers/{name}/scale",
"description": "API at /apis/extensions/v1beta1",
"operations": [
{
"type": "v1beta1.Scale",
"method": "GET",
"summary": "read scale of the specified Scale",
"nickname": "readNamespacedScaleScale",
"parameters": [
{
"type": "string",
"paramType": "query",
"name": "pretty",
"description": "If 'true', then the output is pretty printed.",
"required": false,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Scale",
"required": true,
"allowMultiple": false
}
],
"responseMessages": [
{
"code": 200,
"message": "OK",
"responseModel": "v1beta1.Scale"
}
],
"produces": [
"application/json"
],
"consumes": [
"*/*"
]
},
{
"type": "v1beta1.Scale",
"method": "PUT",
"summary": "replace scale of the specified Scale",
"nickname": "replaceNamespacedScaleScale",
"parameters": [
{
"type": "string",
"paramType": "query",
"name": "pretty",
"description": "If 'true', then the output is pretty printed.",
"required": false,
"allowMultiple": false
},
{
"type": "v1beta1.Scale",
"paramType": "body",
"name": "body",
"description": "",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Scale",
"required": true,
"allowMultiple": false
}
],
"responseMessages": [
{
"code": 200,
"message": "OK",
"responseModel": "v1beta1.Scale"
}
],
"produces": [
"application/json"
],
"consumes": [
"*/*"
]
},
{
"type": "v1beta1.Scale",
"method": "PATCH",
"summary": "partially update scale of the specified Scale",
"nickname": "patchNamespacedScaleScale",
"parameters": [
{
"type": "string",
"paramType": "query",
"name": "pretty",
"description": "If 'true', then the output is pretty printed.",
"required": false,
"allowMultiple": false
},
{
"type": "unversioned.Patch",
"paramType": "body",
"name": "body",
"description": "",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "namespace",
"description": "object name and auth scope, such as for teams and projects",
"required": true,
"allowMultiple": false
},
{
"type": "string",
"paramType": "path",
"name": "name",
"description": "name of the Scale",
"required": true,
"allowMultiple": false
}
],
"responseMessages": [
{
"code": 200,
"message": "OK",
"responseModel": "v1beta1.Scale"
}
],
"produces": [
"application/json"
],
"consumes": [
"application/json-patch+json",
"application/merge-patch+json",
"application/strategic-merge-patch+json"
]
}
]
},
{
"path": "/apis/extensions/v1beta1",
"description": "API at /apis/extensions/v1beta1",
@ -3745,6 +3904,61 @@
"description": "Human readable message indicating details about last transition."
}
}
},
"v1beta1.Scale": {
"id": "v1beta1.Scale",
"description": "represents a scaling request for a resource.",
"properties": {
"kind": {
"type": "string",
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
},
"apiVersion": {
"type": "string",
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
},
"metadata": {
"$ref": "v1.ObjectMeta",
"description": "Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata."
},
"spec": {
"$ref": "v1beta1.ScaleSpec",
"description": "defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status."
},
"status": {
"$ref": "v1beta1.ScaleStatus",
"description": "current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only."
}
}
},
"v1beta1.ScaleSpec": {
"id": "v1beta1.ScaleSpec",
"description": "describes the attributes of a scale subresource",
"properties": {
"replicas": {
"type": "integer",
"format": "int32",
"description": "desired number of instances for the scaled object."
}
}
},
"v1beta1.ScaleStatus": {
"id": "v1beta1.ScaleStatus",
"description": "represents the current status of a scale subresource.",
"required": [
"replicas"
],
"properties": {
"replicas": {
"type": "integer",
"format": "int32",
"description": "actual number of observed instances of the scaled object."
},
"selector": {
"type": "any",
"description": "label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
}
}
}
}
}

8
pkg/master/master.go
View File

@ -1048,15 +1048,13 @@ func (m *Master) experimental(c *Config) *apiserver.APIGroupVersion {
}
storage := map[string]rest.Storage{}
if isEnabled("replicationcontrollers") {
controllerStorage := expcontrolleretcd.NewStorage(c.StorageDestinations.get("", "replicationControllers"))
storage["replicationcontrollers"] = controllerStorage.ReplicationController
storage["replicationcontrollers/scale"] = controllerStorage.Scale
}
if isEnabled("horizontalpodautoscalers") {
autoscalerStorage, autoscalerStatusStorage := horizontalpodautoscaleretcd.NewREST(dbClient("horizonalpodautoscalers"))
storage["horizontalpodautoscalers"] = autoscalerStorage
storage["horizontalpodautoscalers/status"] = autoscalerStatusStorage
controllerStorage := expcontrolleretcd.NewStorage(c.StorageDestinations.get("", "replicationControllers"))
storage["replicationcontrollers"] = controllerStorage.ReplicationController
storage["replicationcontrollers/scale"] = controllerStorage.Scale
}
if isEnabled("thirdpartyresources") {
thirdPartyResourceStorage := thirdpartyresourceetcd.NewREST(dbClient("thirdpartyresources"))

144
test/e2e/horizontal_pod_autoscaling.go
View File

@ -17,7 +17,9 @@ limitations under the License.
package e2e
import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
. "github.com/onsi/ginkgo"
)
@ -31,130 +33,44 @@ var _ = Describe("Horizontal pod autoscaling", func() {
f := NewFramework("horizontal-pod-autoscaling")
// CPU tests
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)
It("[Skipped][Autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 5 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 250, 0, 500, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.1")
createCPUHorizontalPodAutoscaler(rc, 20)
rc.WaitForReplicas(3)
rc.ConsumeCPU(700)
rc.WaitForReplicas(5)
})
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)
It("[Skipped][Autoscaling Suite] should scale from 5 pods to 3 pods and from 3 to 1 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 5, 400, 0, 500, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
createCPUHorizontalPodAutoscaler(rc, 30)
rc.WaitForReplicas(3)
rc.ConsumeCPU(100)
rc.WaitForReplicas(1)
})
// Memory tests
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)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "1000")
rc.WaitForReplicas(3)
rc.ConsumeMem(4200)
rc.WaitForReplicas(5)
})
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)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "1000")
rc.WaitForReplicas(3)
rc.ConsumeMem(100)
rc.WaitForReplicas(1)
})
// Backup tests, currently disabled
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(3)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.7")
rc.WaitForReplicas(1)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to maximum 5 pods (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.1")
rc.WaitForReplicas(5)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 1 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 700, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(3)
rc.ConsumeCPU(300)
rc.WaitForReplicas(1)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod and from 1 to 3 (scale resource: CPU)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 800, 100, f)
defer rc.CleanUp()
createCPUHorizontalPodAutoscaler(rc, "0.3")
rc.WaitForReplicas(1)
rc.ConsumeCPU(700)
rc.WaitForReplicas(3)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 800, 100, 900, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(3)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 100, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "700")
rc.WaitForReplicas(1)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to 3 pods and from 3 to 1 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 700, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(3)
rc.ConsumeMem(100)
rc.WaitForReplicas(1)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 3 pods to 1 pod and from 1 to 3 (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 3, 0, 0, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "300")
rc.WaitForReplicas(1)
rc.ConsumeMem(700)
rc.WaitForReplicas(3)
})
It("[Skipped][Horizontal pod autoscaling Suite] should scale from 1 pod to maximum 5 pods (scale resource: Memory)", func() {
rc = NewDynamicResourceConsumer("rc", 1, 0, 700, 100, 800, f)
defer rc.CleanUp()
createMemoryHorizontalPodAutoscaler(rc, "100")
rc.WaitForReplicas(5)
})
})
func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) {
glog.Fatal("createCPUHorizontalPodAutoscaler not implemented!")
// TODO: reimplemente e2e tests for the new API.
}
// argument memory is in megabytes
func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) {
glog.Fatal("createMemoryHorizontalPodAutoscaler not implemented!")
// TODO: reimplemente e2e tests for the new API.
func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu int) {
minReplicas := 1
hpa := &extensions.HorizontalPodAutoscaler{
ObjectMeta: api.ObjectMeta{
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: &minReplicas,
MaxReplicas: 5,
CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: cpu},
},
}
_, errHPA := rc.framework.Client.Extensions().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
expectNoError(errHPA)
}