github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

support args for newrc funcs

Browse Source
This commit is contained in:
Jeffrey Sica 2019-07-25 19:11:36 -04:00
parent a1f4c2ed21
commit ea2f6c80d7
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/apps/network_partition.go
View File

@ -246,7 +246,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
numNodes, err := e2enode.TotalRegistered(f.ClientSet) numNodes, err := e2enode.TotalRegistered(f.ClientSet)
framework.ExpectNoError(err) framework.ExpectNoError(err)
replicas := int32(numNodes) 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) err = e2epod.VerifyPods(c, ns, name, true, replicas)
framework.ExpectNoError(err, "Each pod should start running and responding") 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) numNodes, err := e2enode.TotalRegistered(f.ClientSet)
framework.ExpectNoError(err) framework.ExpectNoError(err)
replicas := int32(numNodes) 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) err = e2epod.VerifyPods(c, ns, name, true, replicas)
framework.ExpectNoError(err, "Each pod should start running and responding") framework.ExpectNoError(err, "Each pod should start running and responding")

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

@ -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. // 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)) ginkgo.By(fmt.Sprintf("creating replication controller %s", name))
if containerArgs == nil {
containerArgs = []string{"serve-hostname"}
}
return c.CoreV1().ReplicationControllers(ns).Create(framework.RcByNamePort( 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. // RestartNodes restarts specific nodes.

5
test/e2e/framework/rc_util.go
View File

@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
@ -36,12 +36,13 @@ import (
) )
// RcByNamePort returns a ReplicationController with specified name and port // 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 { labels map[string]string, gracePeriod *int64) *v1.ReplicationController {
return RcByNameContainer(name, replicas, image, labels, v1.Container{ return RcByNameContainer(name, replicas, image, labels, v1.Container{
Name: name, Name: name,
Image: image, Image: image,
Args: containerArgs,
Ports: []v1.ContainerPort{{ContainerPort: int32(port), Protocol: protocol}}, Ports: []v1.ContainerPort{{ContainerPort: int32(port), Protocol: protocol}},
}, gracePeriod) }, gracePeriod)
} }

2
test/e2e/lifecycle/ha_master.go
View File

@ -75,7 +75,7 @@ func verifyRCs(c clientset.Interface, ns string, names []string) {
} }
func createNewRC(c clientset.Interface, ns string, name 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) framework.ExpectNoError(err)
} }

4
test/e2e/lifecycle/resize_nodes.go
View File

@ -116,7 +116,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() {
numNodes, err := e2enode.TotalRegistered(c) numNodes, err := e2enode.TotalRegistered(c)
framework.ExpectNoError(err) framework.ExpectNoError(err)
originalNodeCount = int32(numNodes) 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) err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -147,7 +147,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() {
numNodes, err := e2enode.TotalRegistered(c) numNodes, err := e2enode.TotalRegistered(c)
framework.ExpectNoError(err) framework.ExpectNoError(err)
originalNodeCount = int32(numNodes) 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) err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount)
framework.ExpectNoError(err) framework.ExpectNoError(err)