github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
test/e2e/framework/rc/:refactor function ByNameContainer remove unused flag
This commit is contained in:
Kubernetes Prow Robot 2020-01-16 18:57:17 -08:00 committed by GitHub
commit 90d6484f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/common/util.go
View File

@ -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, func rcByNamePort(name string, replicas int32, image string, containerArgs []string, port int, protocol v1.Protocol,
labels map[string]string, gracePeriod *int64) *v1.ReplicationController { 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, Name: name,
Image: image, Image: image,
Args: containerArgs, Args: containerArgs,

2
test/e2e/framework/rc/rc_utils.go
View File

@ -32,7 +32,7 @@ import (
) )
// ByNameContainer returns a ReplicationController with specified name and container // 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 { gracePeriod *int64) *v1.ReplicationController {
zeroGracePeriod := int64(0) zeroGracePeriod := int64(0)

2
test/e2e/network/service.go
View File

@ -1969,7 +1969,7 @@ var _ = SIGDescribe("Services", func() {
PublishNotReadyAddresses: true, 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)}, Args: []string{"netexec", fmt.Sprintf("--http-port=%d", port)},
Name: t.Name, Name: t.Name,
Image: t.Image, Image: t.Image,