Commit cb5e50c5 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #26690 from jszczepkowski/hpa-testfix

Automatic merge from submit-queue Fixed problem with too long name in e2e autoscaling tests. [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() Fixed problem with too long name in e2e autoscaling tests.
parents 431040af 862e2fe2
...@@ -99,7 +99,7 @@ func newResourceConsumer(name, kind string, replicas, initCPUTotal, initMemoryTo ...@@ -99,7 +99,7 @@ func newResourceConsumer(name, kind string, replicas, initCPUTotal, initMemoryTo
runServiceAndWorkloadForResourceConsumer(f.Client, f.Namespace.Name, name, kind, replicas, cpuLimit, memLimit) runServiceAndWorkloadForResourceConsumer(f.Client, f.Namespace.Name, name, kind, replicas, cpuLimit, memLimit)
rc := &ResourceConsumer{ rc := &ResourceConsumer{
name: name, name: name,
controllerName: name + "-controller", controllerName: name + "-ctrl",
kind: kind, kind: kind,
framework: f, framework: f,
cpu: make(chan int), cpu: make(chan int),
...@@ -361,7 +361,7 @@ func runServiceAndWorkloadForResourceConsumer(c *client.Client, ns, name, kind s ...@@ -361,7 +361,7 @@ func runServiceAndWorkloadForResourceConsumer(c *client.Client, ns, name, kind s
} }
By(fmt.Sprintf("Running controller")) By(fmt.Sprintf("Running controller"))
controllerName := name + "-controller" controllerName := name + "-ctrl"
_, err = c.Services(ns).Create(&api.Service{ _, err = c.Services(ns).Create(&api.Service{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: controllerName, Name: controllerName,
......
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