From ea2f6c80d7c95a12330f39ca637461abb654fded Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Thu, 25 Jul 2019 19:11:36 -0400 Subject: [PATCH] support args for newrc funcs --- test/e2e/apps/network_partition.go | 4 ++-- test/e2e/common/util.go | 9 +++++++-- test/e2e/framework/rc_util.go | 5 +++-- test/e2e/lifecycle/ha_master.go | 2 +- test/e2e/lifecycle/resize_nodes.go | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/e2e/apps/network_partition.go b/test/e2e/apps/network_partition.go index c0ac8f26666..a3f44fc98bd 100644 --- a/test/e2e/apps/network_partition.go +++ b/test/e2e/apps/network_partition.go @@ -246,7 +246,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { numNodes, err := e2enode.TotalRegistered(f.ClientSet) framework.ExpectNoError(err) replicas := int32(numNodes) - common.NewRCByName(c, ns, name, replicas, nil) + common.NewRCByName(c, ns, name, replicas, nil, nil) err = e2epod.VerifyPods(c, ns, name, true, replicas) framework.ExpectNoError(err, "Each pod should start running and responding") @@ -313,7 +313,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { numNodes, err := e2enode.TotalRegistered(f.ClientSet) framework.ExpectNoError(err) replicas := int32(numNodes) - common.NewRCByName(c, ns, name, replicas, &gracePeriod) + common.NewRCByName(c, ns, name, replicas, &gracePeriod, []string{"serve-hostname"}) err = e2epod.VerifyPods(c, ns, name, true, replicas) framework.ExpectNoError(err, "Each pod should start running and responding") diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index dfa38c8fb4c..abb82925248 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -134,10 +134,15 @@ func NewSVCByName(c clientset.Interface, ns, name string) error { } // NewRCByName creates a replication controller with a selector by name of name. -func NewRCByName(c clientset.Interface, ns, name string, replicas int32, gracePeriod *int64) (*v1.ReplicationController, error) { +func NewRCByName(c clientset.Interface, ns, name string, replicas int32, gracePeriod *int64, containerArgs []string) (*v1.ReplicationController, error) { ginkgo.By(fmt.Sprintf("creating replication controller %s", name)) + + if containerArgs == nil { + containerArgs = []string{"serve-hostname"} + } + return c.CoreV1().ReplicationControllers(ns).Create(framework.RcByNamePort( - name, replicas, framework.ServeHostnameImage, 9376, v1.ProtocolTCP, map[string]string{}, gracePeriod)) + name, replicas, framework.ServeHostnameImage, containerArgs, 9376, v1.ProtocolTCP, map[string]string{}, gracePeriod)) } // RestartNodes restarts specific nodes. diff --git a/test/e2e/framework/rc_util.go b/test/e2e/framework/rc_util.go index 8d4baa0793b..a0755b07834 100644 --- a/test/e2e/framework/rc_util.go +++ b/test/e2e/framework/rc_util.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/wait" @@ -36,12 +36,13 @@ import ( ) // RcByNamePort returns a ReplicationController with specified name and port -func RcByNamePort(name string, replicas int32, image 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 { return RcByNameContainer(name, replicas, image, labels, v1.Container{ Name: name, Image: image, + Args: containerArgs, Ports: []v1.ContainerPort{{ContainerPort: int32(port), Protocol: protocol}}, }, gracePeriod) } diff --git a/test/e2e/lifecycle/ha_master.go b/test/e2e/lifecycle/ha_master.go index 00aef5e0fee..193f8501007 100644 --- a/test/e2e/lifecycle/ha_master.go +++ b/test/e2e/lifecycle/ha_master.go @@ -75,7 +75,7 @@ func verifyRCs(c clientset.Interface, ns string, names []string) { } func createNewRC(c clientset.Interface, ns string, name string) { - _, err := common.NewRCByName(c, ns, name, 1, nil) + _, err := common.NewRCByName(c, ns, name, 1, nil, nil) framework.ExpectNoError(err) } diff --git a/test/e2e/lifecycle/resize_nodes.go b/test/e2e/lifecycle/resize_nodes.go index 0047d88d11f..c69c81ee0b4 100644 --- a/test/e2e/lifecycle/resize_nodes.go +++ b/test/e2e/lifecycle/resize_nodes.go @@ -116,7 +116,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { numNodes, err := e2enode.TotalRegistered(c) framework.ExpectNoError(err) originalNodeCount = int32(numNodes) - common.NewRCByName(c, ns, name, originalNodeCount, nil) + common.NewRCByName(c, ns, name, originalNodeCount, nil, nil) err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount) framework.ExpectNoError(err) @@ -147,7 +147,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { numNodes, err := e2enode.TotalRegistered(c) framework.ExpectNoError(err) originalNodeCount = int32(numNodes) - common.NewRCByName(c, ns, name, originalNodeCount, nil) + common.NewRCByName(c, ns, name, originalNodeCount, nil, nil) err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount) framework.ExpectNoError(err)