kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1989 from kgolab/kg-vpa-naming-cleanup 

Fix confusing naming & remove a stale comment
This commit is contained in:
Kubernetes Prow Robot 2019-05-06 07:09:40 -07:00 committed by GitHub
parent 5ac706fdfa de1ed07e56
commit 65f59b070e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vertical-pod-autoscaler/e2e/v1beta1/autoscaling_utils.go
View File

@ -78,7 +78,7 @@ var (
) )
/* /*
ResourceConsumer is a tool for testing. It helps create specified usage of CPU or memory (Warning: memory not supported) ResourceConsumer is a tool for testing. It helps create specified usage of CPU or memory
typical use case: typical use case:
rc.ConsumeCPU(600) rc.ConsumeCPU(600)
// ... check your assumption here // ... check your assumption here
@ -127,8 +127,8 @@ func NewStaticResourceConsumer(name, nsName string, replicas, initCPUTotal, init
NewResourceConsumer creates new ResourceConsumer NewResourceConsumer creates new ResourceConsumer
initCPUTotal argument is in millicores initCPUTotal argument is in millicores
initMemoryTotal argument is in megabytes initMemoryTotal argument is in megabytes
memLimit argument is in megabytes, memLimit is a maximum amount of memory that can be consumed by a single pod memRequest argument is in megabytes, it specifies the original Pod resource request
cpuLimit argument is in millicores, cpuLimit is a maximum amount of cpu that can be consumed by a single pod cpuRequest argument is in millicores, it specifies the original Pod resource request
*/ */
func newResourceConsumer(name, nsName string, kind schema.GroupVersionKind, replicas, initCPUTotal, initMemoryTotal, initCustomMetric, consumptionTimeInSeconds, requestSizeInMillicores, func newResourceConsumer(name, nsName string, kind schema.GroupVersionKind, replicas, initCPUTotal, initMemoryTotal, initCustomMetric, consumptionTimeInSeconds, requestSizeInMillicores,
requestSizeInMegabytes int, requestSizeCustomMetric int, cpuRequest, memRequest resource.Quantity, clientset clientset.Interface, internalClientset *internalclientset.Clientset) *ResourceConsumer { requestSizeInMegabytes int, requestSizeCustomMetric int, cpuRequest, memRequest resource.Quantity, clientset clientset.Interface, internalClientset *internalclientset.Clientset) *ResourceConsumer {
@ -418,7 +418,7 @@ func (rc *ResourceConsumer) CleanUp() {
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil))
} }
func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalClient internalclientset.Interface, ns, name string, kind schema.GroupVersionKind, replicas int, cpuLimit, memLimit resource.Quantity) { func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalClient internalclientset.Interface, ns, name string, kind schema.GroupVersionKind, replicas int, cpuRequest, memRequest resource.Quantity) {
ginkgo.By(fmt.Sprintf("Running consuming RC %s via %s with %v replicas", name, kind, replicas)) ginkgo.By(fmt.Sprintf("Running consuming RC %s via %s with %v replicas", name, kind, replicas))
_, err := c.CoreV1().Services(ns).Create(&v1.Service{ _, err := c.CoreV1().Services(ns).Create(&v1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -445,8 +445,8 @@ func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalCli
Namespace: ns, Namespace: ns,
Timeout: timeoutRC, Timeout: timeoutRC,
Replicas: replicas, Replicas: replicas,
CpuRequest: cpuLimit.MilliValue(), CpuRequest: cpuRequest.MilliValue(),
MemRequest: memLimit.Value(), MemRequest: memRequest.Value(),
} }
switch kind { switch kind {

12
vertical-pod-autoscaler/e2e/v1beta2/autoscaling_utils.go
View File

@ -78,7 +78,7 @@ var (
) )
/* /*
ResourceConsumer is a tool for testing. It helps create specified usage of CPU or memory (Warning: memory not supported) ResourceConsumer is a tool for testing. It helps create specified usage of CPU or memory
typical use case: typical use case:
rc.ConsumeCPU(600) rc.ConsumeCPU(600)
// ... check your assumption here // ... check your assumption here
@ -127,8 +127,8 @@ func NewStaticResourceConsumer(name, nsName string, replicas, initCPUTotal, init
NewResourceConsumer creates new ResourceConsumer NewResourceConsumer creates new ResourceConsumer
initCPUTotal argument is in millicores initCPUTotal argument is in millicores
initMemoryTotal argument is in megabytes initMemoryTotal argument is in megabytes
memLimit argument is in megabytes, memLimit is a maximum amount of memory that can be consumed by a single pod memRequest argument is in megabytes, it specifies the original Pod resource request
cpuLimit argument is in millicores, cpuLimit is a maximum amount of cpu that can be consumed by a single pod cpuRequest argument is in millicores, it specifies the original Pod resource request
*/ */
func newResourceConsumer(name, nsName string, kind schema.GroupVersionKind, replicas, initCPUTotal, initMemoryTotal, initCustomMetric, consumptionTimeInSeconds, requestSizeInMillicores, func newResourceConsumer(name, nsName string, kind schema.GroupVersionKind, replicas, initCPUTotal, initMemoryTotal, initCustomMetric, consumptionTimeInSeconds, requestSizeInMillicores,
requestSizeInMegabytes int, requestSizeCustomMetric int, cpuRequest, memRequest resource.Quantity, clientset clientset.Interface, internalClientset *internalclientset.Clientset) *ResourceConsumer { requestSizeInMegabytes int, requestSizeCustomMetric int, cpuRequest, memRequest resource.Quantity, clientset clientset.Interface, internalClientset *internalclientset.Clientset) *ResourceConsumer {
@ -418,7 +418,7 @@ func (rc *ResourceConsumer) CleanUp() {
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil))
} }
func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalClient internalclientset.Interface, ns, name string, kind schema.GroupVersionKind, replicas int, cpuLimit, memLimit resource.Quantity) { func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalClient internalclientset.Interface, ns, name string, kind schema.GroupVersionKind, replicas int, cpuRequest, memRequest resource.Quantity) {
ginkgo.By(fmt.Sprintf("Running consuming RC %s via %s with %v replicas", name, kind, replicas)) ginkgo.By(fmt.Sprintf("Running consuming RC %s via %s with %v replicas", name, kind, replicas))
_, err := c.CoreV1().Services(ns).Create(&v1.Service{ _, err := c.CoreV1().Services(ns).Create(&v1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -445,8 +445,8 @@ func runServiceAndWorkloadForResourceConsumer(c clientset.Interface, internalCli
Namespace: ns, Namespace: ns,
Timeout: timeoutRC, Timeout: timeoutRC,
Replicas: replicas, Replicas: replicas,
CpuRequest: cpuLimit.MilliValue(), CpuRequest: cpuRequest.MilliValue(),
MemRequest: memLimit.Value(), MemRequest: memRequest.Value(),
} }
switch kind { switch kind {