Merge pull request kubernetes#87274 from tanjunchen/refactor-function-e2erc.ByNameContainer

k8s-ci-robot · web-flow · commit 90d6484f1c59 · 2020-01-16T18:57:17.000-08:00
test/e2e/framework/rc/:refactor function ByNameContainer remove unused flag
diff --git 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
@@ -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
@@ -1969,7 +1969,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,

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`// ByNameContainer returns a ReplicationController with specified name and container`
`35`		`-func ByNameContainer(name string, replicas int32, image string, labels map[string]string, c v1.Container,`
	`35`	`+func ByNameContainer(name string, replicas int32, labels map[string]string, c v1.Container,`
`36`	`36`	`gracePeriod int64) v1.ReplicationController {`
`37`	`37`
`38`	`38`	`zeroGracePeriod := int64(0)`
Original file line number	Diff line number	Diff line change
`@@ -1969,7 +1969,7 @@ var _ = SIGDescribe("Services", func() {`
`1969`	`1969`	`PublishNotReadyAddresses: true,`
`1970`	`1970`	`},`
`1971`	`1971`	`}`
`1972`		`- rcSpec := e2erc.ByNameContainer(t.Name, 1, t.Image, t.Labels, v1.Container{`
	`1972`	`+ rcSpec := e2erc.ByNameContainer(t.Name, 1, t.Labels, v1.Container{`
`1973`	`1973`	`Args: []string{"netexec", fmt.Sprintf("--http-port=%d", port)},`
`1974`	`1974`	`Name: t.Name,`
`1975`	`1975`	`Image: t.Image,`