Skip to content

Commit 91dca8f

Browse files
k-toyoda-pik-toyoda-pi
committed
Use e2eskipper package in e2e/apps
1 parent 9269b5d commit 91dca8f

File tree

8 files changed

+26
-18
lines changed

8 files changed

+26
-18
lines changed

‎test/e2e/apps/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ go_library(
7272
"//test/e2e/framework/rc:go_default_library",
7373
"//test/e2e/framework/replicaset:go_default_library",
7474
"//test/e2e/framework/service:go_default_library",
75+
"//test/e2e/framework/skipper:go_default_library",
7576
"//test/e2e/framework/ssh:go_default_library",
7677
"//test/e2e/framework/statefulset:go_default_library",
7778
"//test/utils:go_default_library",

‎test/e2e/apps/cronjob.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"k8s.io/kubernetes/pkg/controller/job"
3636
"k8s.io/kubernetes/test/e2e/framework"
3737
jobutil "k8s.io/kubernetes/test/e2e/framework/job"
38+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3839
imageutils "k8s.io/kubernetes/test/utils/image"
3940
)
4041

@@ -53,7 +54,7 @@ var _ = SIGDescribe("CronJob", func() {
5354
failureCommand := []string{"/bin/false"}
5455

5556
ginkgo.BeforeEach(func() {
56-
framework.SkipIfMissingResource(f.DynamicClient, CronJobGroupVersionResourceBeta, f.Namespace.Name)
57+
e2eskipper.SkipIfMissingResource(f.DynamicClient, CronJobGroupVersionResourceBeta, f.Namespace.Name)
5758
})
5859

5960
// multiple jobs running at once

‎test/e2e/apps/daemon_restart.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"k8s.io/kubernetes/test/e2e/framework"
3636
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3737
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
38+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3839
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
3940
testutils "k8s.io/kubernetes/test/utils"
4041
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -204,7 +205,7 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {
204205

205206
ginkgo.BeforeEach(func() {
206207
// These tests require SSH
207-
framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
208+
e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
208209
ns = f.Namespace.Name
209210

210211
// All the restart tests need an rc and a watch on pods of the rc.
@@ -258,7 +259,7 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {
258259
ginkgo.It("Controller Manager should not create/delete replicas across restart", func() {
259260

260261
// Requires master ssh access.
261-
framework.SkipUnlessProviderIs("gce", "aws")
262+
e2eskipper.SkipUnlessProviderIs("gce", "aws")
262263
restarter := NewRestartConfig(
263264
framework.GetMasterHost(), "kube-controller", ports.InsecureKubeControllerManagerPort, restartPollInterval, restartTimeout)
264265
restarter.restart()
@@ -289,7 +290,7 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {
289290
ginkgo.It("Scheduler should continue assigning pods to nodes across restart", func() {
290291

291292
// Requires master ssh access.
292-
framework.SkipUnlessProviderIs("gce", "aws")
293+
e2eskipper.SkipUnlessProviderIs("gce", "aws")
293294
restarter := NewRestartConfig(
294295
framework.GetMasterHost(), "kube-scheduler", ports.InsecureSchedulerPort, restartPollInterval, restartTimeout)
295296

‎test/e2e/apps/deployment.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4646
"k8s.io/kubernetes/test/e2e/framework/replicaset"
4747
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
48+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4849
testutil "k8s.io/kubernetes/test/utils"
4950
utilpointer "k8s.io/utils/pointer"
5051
)
@@ -125,7 +126,7 @@ var _ = SIGDescribe("Deployment", func() {
125126
testProportionalScalingDeployment(f)
126127
})
127128
ginkgo.It("should not disrupt a cloud load-balancer's connectivity during rollout", func() {
128-
framework.SkipUnlessProviderIs("aws", "azure", "gce", "gke")
129+
e2eskipper.SkipUnlessProviderIs("aws", "azure", "gce", "gke")
129130
testRollingUpdateDeploymentWithLocalTrafficLoadBalancer(f)
130131
})
131132
// TODO: add tests that cover deployment.Spec.MinReadySeconds once we solved clock-skew issues

‎test/e2e/apps/disruption.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/client-go/util/retry"
3434
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
3535
"k8s.io/kubernetes/test/e2e/framework"
36+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3637
imageutils "k8s.io/kubernetes/test/utils/image"
3738
)
3839

@@ -149,7 +150,7 @@ var _ = SIGDescribe("DisruptionController", func() {
149150
}
150151
ginkgo.It(fmt.Sprintf("evictions: %s => %s", c.description, expectation), func() {
151152
if c.skipForBigClusters {
152-
framework.SkipUnlessNodeCountIsAtMost(bigClusterSize - 1)
153+
e2eskipper.SkipUnlessNodeCountIsAtMost(bigClusterSize - 1)
153154
}
154155
createPodsOrDie(cs, ns, c.podCount)
155156
if c.replicaSetSize > 0 {

‎test/e2e/apps/network_partition.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
4242
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4343
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
44+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4445
e2esset "k8s.io/kubernetes/test/e2e/framework/statefulset"
4546
testutils "k8s.io/kubernetes/test/utils"
4647

@@ -120,7 +121,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
120121
framework.ExpectNoError(err)
121122

122123
// TODO(foxish): Re-enable testing on gce after kubernetes#56787 is fixed.
123-
framework.SkipUnlessProviderIs("gke", "aws")
124+
e2eskipper.SkipUnlessProviderIs("gke", "aws")
124125
if strings.Index(framework.TestContext.CloudConfig.NodeInstanceGroup, ",") >= 0 {
125126
framework.Failf("Test dose not support cluster setup with more than one MIG: %s", framework.TestContext.CloudConfig.NodeInstanceGroup)
126127
}
@@ -129,8 +130,8 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
129130
framework.KubeDescribe("Pods", func() {
130131
ginkgo.Context("should return to running and ready state after network partition is healed", func() {
131132
ginkgo.BeforeEach(func() {
132-
framework.SkipUnlessNodeCountIsAtLeast(2)
133-
framework.SkipUnlessSSHKeyPresent()
133+
e2eskipper.SkipUnlessNodeCountIsAtLeast(2)
134+
e2eskipper.SkipUnlessSSHKeyPresent()
134135
})
135136

136137
// What happens in this test:
@@ -239,7 +240,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
239240
framework.KubeDescribe("[ReplicationController]", func() {
240241
ginkgo.It("should recreate pods scheduled on the unreachable node "+
241242
"AND allow scheduling of pods on a node after it rejoins the cluster", func() {
242-
framework.SkipUnlessSSHKeyPresent()
243+
e2eskipper.SkipUnlessSSHKeyPresent()
243244

244245
// Create a replication controller for a service that serves its hostname.
245246
// The source for the Docker container kubernetes/serve_hostname is in contrib/for-demos/serve_hostname
@@ -306,7 +307,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
306307
})
307308

308309
ginkgo.It("should eagerly create replacement pod during network partition when termination grace is non-zero", func() {
309-
framework.SkipUnlessSSHKeyPresent()
310+
e2eskipper.SkipUnlessSSHKeyPresent()
310311

311312
// Create a replication controller for a service that serves its hostname.
312313
// The source for the Docker container kubernetes/serve_hostname is in contrib/for-demos/serve_hostname
@@ -363,7 +364,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
363364

364365
ginkgo.BeforeEach(func() {
365366
// TODO(foxish): Re-enable testing on gce after kubernetes#56787 is fixed.
366-
framework.SkipUnlessProviderIs("gke")
367+
e2eskipper.SkipUnlessProviderIs("gke")
367368
ginkgo.By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name)
368369
headlessService := e2eservice.CreateServiceSpec(headlessSvcName, "", true, labels)
369370
_, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(headlessService)
@@ -398,7 +399,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
398399
})
399400

400401
ginkgo.It("should not reschedule stateful pods if there is a network partition [Slow] [Disruptive]", func() {
401-
framework.SkipUnlessSSHKeyPresent()
402+
e2eskipper.SkipUnlessSSHKeyPresent()
402403

403404
ps := e2esset.NewStatefulSet(psName, ns, headlessSvcName, 3, []v1.VolumeMount{}, []v1.VolumeMount{}, labels)
404405
_, err := c.AppsV1().StatefulSets(ns).Create(ps)
@@ -431,7 +432,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
431432

432433
framework.KubeDescribe("[Job]", func() {
433434
ginkgo.It("should create new pods when node is partitioned", func() {
434-
framework.SkipUnlessSSHKeyPresent()
435+
e2eskipper.SkipUnlessSSHKeyPresent()
435436

436437
parallelism := int32(2)
437438
completions := int32(4)
@@ -479,7 +480,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
479480
framework.KubeDescribe("Pods", func() {
480481
ginkgo.Context("should be evicted from unready Node", func() {
481482
ginkgo.BeforeEach(func() {
482-
framework.SkipUnlessNodeCountIsAtLeast(2)
483+
e2eskipper.SkipUnlessNodeCountIsAtLeast(2)
483484
})
484485

485486
// What happens in this test:
@@ -490,7 +491,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
490491
// 3. After enough time passess all Pods are evicted from the given Node
491492
ginkgo.It("[Feature:TaintEviction] All pods on the unreachable node should be marked as NotReady upon the node turn NotReady "+
492493
"AND all pods should be evicted after eviction timeout passes", func() {
493-
framework.SkipUnlessSSHKeyPresent()
494+
e2eskipper.SkipUnlessSSHKeyPresent()
494495
ginkgo.By("choose a node - we will block all network traffic on this node")
495496
var podOpts metav1.ListOptions
496497
nodes, err := e2enode.GetReadySchedulableNodes(c)

‎test/e2e/apps/rc.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/kubernetes/pkg/controller/replication"
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
imageutils "k8s.io/kubernetes/test/utils/image"
3536

3637
"github.com/onsi/ginkgo"
@@ -51,7 +52,7 @@ var _ = SIGDescribe("ReplicationController", func() {
5152

5253
ginkgo.It("should serve a basic image on each replica with a private image", func() {
5354
// requires private images
54-
framework.SkipUnlessProviderIs("gce", "gke")
55+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
5556
privateimage := imageutils.GetConfig(imageutils.AgnhostPrivate)
5657
TestReplicationControllerServeImageOrFail(f, "private", privateimage.GetE2EImage())
5758
})

‎test/e2e/apps/replica_set.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3434
replicasetutil "k8s.io/kubernetes/test/e2e/framework/replicaset"
35+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3536

3637
"github.com/onsi/ginkgo"
3738
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -95,7 +96,7 @@ var _ = SIGDescribe("ReplicaSet", func() {
9596

9697
ginkgo.It("should serve a basic image on each replica with a private image", func() {
9798
// requires private images
98-
framework.SkipUnlessProviderIs("gce", "gke")
99+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
99100
privateimage := imageutils.GetConfig(imageutils.AgnhostPrivate)
100101
testReplicaSetServeImageOrFail(f, "private", privateimage.GetE2EImage())
101102
})

0 commit comments

Comments
 (0)