mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #87274 from tanjunchen/refactor-function-e2erc.ByNameContainer
test/e2e/framework/rc/:refactor function ByNameContainer remove unused flag
This commit is contained in:
commit
90d6484f1c
@ -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,
|
||||||
|
@ -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)
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user