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

Merge pull request #48826 from mikedanese/fix-upgrade 

Automatic merge from submit-queue (batch tested with PRs 46748, 48826)

scheduler e2e: make container name shorter

Fixes https://github.com/kubernetes/kubernetes/issues/48825
pull/6/head
Kubernetes Submit Queue 2017-07-14 02:03:43 -07:00 committed by GitHub
parent d623bd4c44 dafad706af
commit 096edd6452
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/scheduling/priorities.go
View File

@ -398,7 +398,7 @@ func createBalancedPodForNodes(f *framework.Framework, cs clientset.Interface, n
needCreateResource["memory"] = *resource.NewQuantity(int64((ratio-memFraction)*float64(memAllocatableVal)), resource.BinarySI)
err := testutils.StartPods(cs, 1, ns, "priority-balanced-mem-"+node.Name,
err := testutils.StartPods(cs, 1, ns, string(uuid.NewUUID()),
*initPausePod(f, pausePodConfig{
Name: "",
Labels: balancePodLabel,