From 1db3f45dc596e80672b04f1b9a0035776a16a392 Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Thu, 16 Jan 2020 13:49:02 +0800 Subject: [PATCH] test/e2e/framework/rc/:refactor function ByNameContainer --- test/e2e/common/util.go | 2 +- test/e2e/framework/rc/rc_utils.go | 2 +- test/e2e/network/service.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index 4551b1dac4b..3d14f41057a 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -205,7 +205,7 @@ func RestartNodes(c clientset.Interface, nodes []v1.Node) error { func rcByNamePort(name string, replicas int32, image string, containerArgs []string, port int, protocol v1.Protocol, labels map[string]string, gracePeriod *int64) *v1.ReplicationController { - return e2erc.ByNameContainer(name, replicas, image, labels, v1.Container{ + return e2erc.ByNameContainer(name, replicas, labels, v1.Container{ Name: name, Image: image, Args: containerArgs, diff --git a/test/e2e/framework/rc/rc_utils.go b/test/e2e/framework/rc/rc_utils.go index 6d9a104fb65..9531ae9cfc2 100644 --- a/test/e2e/framework/rc/rc_utils.go +++ b/test/e2e/framework/rc/rc_utils.go @@ -32,7 +32,7 @@ import ( ) // ByNameContainer returns a ReplicationController with specified name and container -func ByNameContainer(name string, replicas int32, image string, labels map[string]string, c v1.Container, +func ByNameContainer(name string, replicas int32, labels map[string]string, c v1.Container, gracePeriod *int64) *v1.ReplicationController { zeroGracePeriod := int64(0) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index 4bcd5ff55ab..5c3da0c8f5e 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -1966,7 +1966,7 @@ var _ = SIGDescribe("Services", func() { PublishNotReadyAddresses: true, }, } - rcSpec := e2erc.ByNameContainer(t.Name, 1, t.Image, t.Labels, v1.Container{ + rcSpec := e2erc.ByNameContainer(t.Name, 1, t.Labels, v1.Container{ Args: []string{"netexec", fmt.Sprintf("--http-port=%d", port)}, Name: t.Name, Image: t.Image,