Skip to content

Commit 652cc2e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87073 from tanjunchen/migrate-to-skipper-002
e2e/network/:Use e2eskipper package
2 parents e1cc360 + 586e1f2 commit 652cc2e

File tree

12 files changed

+51
-39
lines changed

12 files changed

+51
-39
lines changed

‎test/e2e/network/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ go_library(
7474
"//test/e2e/framework/providers/gce:go_default_library",
7575
"//test/e2e/framework/rc:go_default_library",
7676
"//test/e2e/framework/service:go_default_library",
77+
"//test/e2e/framework/skipper:go_default_library",
7778
"//test/e2e/framework/ssh:go_default_library",
7879
"//test/e2e/network/scale:go_default_library",
7980
"//test/images/agnhost/net/nat:go_default_library",

‎test/e2e/network/dns.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/kubernetes/test/e2e/framework"
2828
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
29+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2930

3031
"github.com/onsi/ginkgo"
3132
)
@@ -62,7 +63,7 @@ var _ = SIGDescribe("DNS", func() {
6263

6364
// Added due to #8512. This is critical for GCE and GKE deployments.
6465
ginkgo.It("should provide DNS for the cluster [Provider:GCE]", func() {
65-
framework.SkipUnlessProviderIs("gce", "gke")
66+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
6667

6768
namesToResolve := []string{"google.com"}
6869
// Windows containers do not have a route to the GCE metadata server by default.

‎test/e2e/network/dns_configmap.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/util/wait"
2525
"k8s.io/kubernetes/test/e2e/framework"
2626
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
27+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2728

2829
"github.com/onsi/ginkgo"
2930
)
@@ -520,7 +521,7 @@ var _ = SIGDescribe("DNS configMap nameserver [Feature:Networking-IPv6] [LinuxOn
520521

521522
ginkgo.BeforeEach(func() {
522523
// IPv6 is not supported on Windows.
523-
framework.SkipIfNodeOSDistroIs("windows")
524+
e2eskipper.SkipIfNodeOSDistroIs("windows")
524525
})
525526

526527
ginkgo.Context("Change stubDomain", func() {

‎test/e2e/network/firewall.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3333
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
3434
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
35+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3536
gcecloud "k8s.io/legacy-cloud-providers/gce"
3637

3738
"github.com/onsi/ginkgo"
@@ -53,7 +54,7 @@ var _ = SIGDescribe("Firewall rule", func() {
5354
var gceCloud *gcecloud.Cloud
5455

5556
ginkgo.BeforeEach(func() {
56-
framework.SkipUnlessProviderIs("gce")
57+
e2eskipper.SkipUnlessProviderIs("gce")
5758

5859
var err error
5960
cs = f.ClientSet

‎test/e2e/network/ingress.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"k8s.io/kubernetes/test/e2e/framework/ingress"
4040
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
4141
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
42+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4243

4344
"github.com/onsi/ginkgo"
4445
)
@@ -85,7 +86,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
8586

8687
// Platform specific setup
8788
ginkgo.BeforeEach(func() {
88-
framework.SkipUnlessProviderIs("gce", "gke")
89+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
8990
ginkgo.By("Initializing gce controller")
9091
gceController = &gce.IngressController{
9192
Ns: ns,
@@ -242,7 +243,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
242243

243244
// Platform specific setup
244245
ginkgo.BeforeEach(func() {
245-
framework.SkipUnlessProviderIs("gce", "gke")
246+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
246247
ginkgo.By("Initializing gce controller")
247248
gceController = &gce.IngressController{
248249
Ns: ns,
@@ -588,7 +589,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
588589

589590
// Platform specific setup
590591
ginkgo.BeforeEach(func() {
591-
framework.SkipUnlessProviderIs("gce", "gke")
592+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
592593
jig.Class = ingress.MulticlusterIngressClassValue
593594
jig.PollInterval = 5 * time.Second
594595
ginkgo.By("Initializing gce controller")
@@ -716,7 +717,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
716717
var nginxController *ingress.NginxIngressController
717718

718719
ginkgo.BeforeEach(func() {
719-
framework.SkipUnlessProviderIs("gce", "gke")
720+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
720721
ginkgo.By("Initializing nginx controller")
721722
jig.Class = "nginx"
722723
nginxController = &ingress.NginxIngressController{Ns: ns, Client: jig.Client}

‎test/e2e/network/ingress_scale.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package network
1818

1919
import (
2020
"k8s.io/kubernetes/test/e2e/framework"
21+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2122
"k8s.io/kubernetes/test/e2e/network/scale"
2223

2324
"github.com/onsi/ginkgo"
@@ -40,7 +41,7 @@ var _ = SIGDescribe("Loadbalancing: L7 Scalability", func() {
4041
)
4142

4243
ginkgo.BeforeEach(func() {
43-
framework.SkipUnlessProviderIs("gce", "gke")
44+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
4445

4546
scaleFramework = scale.NewIngressScaleFramework(f.ClientSet, ns, framework.TestContext.CloudConfig)
4647
if err := scaleFramework.PrepareScaleTest(); err != nil {

‎test/e2e/network/kube_proxy.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
33+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3334
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
3435
"k8s.io/kubernetes/test/images/agnhost/net/nat"
3536
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -54,7 +55,7 @@ var _ = SIGDescribe("Network", func() {
5455
nodes, err := e2enode.GetBoundedReadySchedulableNodes(fr.ClientSet, 2)
5556
framework.ExpectNoError(err)
5657
if len(nodes.Items) < 2 {
57-
framework.Skipf(
58+
e2eskipper.Skipf(
5859
"Test requires >= 2 Ready nodes, but there are only %v nodes",
5960
len(nodes.Items))
6061
}
@@ -87,7 +88,7 @@ var _ = SIGDescribe("Network", func() {
8788
framework.TestContext.Provider,
8889
clientNodeInfo.node)
8990
if err != nil && strings.Contains(err.Error(), "No such file or directory") {
90-
framework.Skipf("The node %s does not support /proc/net/nf_conntrack", clientNodeInfo.name)
91+
e2eskipper.Skipf("The node %s does not support /proc/net/nf_conntrack", clientNodeInfo.name)
9192
}
9293
framework.ExpectNoError(err)
9394

‎test/e2e/network/network_policy.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"k8s.io/apimachinery/pkg/util/intstr"
2626
"k8s.io/kubernetes/test/e2e/framework"
2727
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
28+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2829
imageutils "k8s.io/kubernetes/test/utils/image"
2930

3031
"fmt"
@@ -49,7 +50,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
4950

5051
ginkgo.BeforeEach(func() {
5152
// Windows does not support network policies.
52-
framework.SkipIfNodeOSDistroIs("windows")
53+
e2eskipper.SkipIfNodeOSDistroIs("windows")
5354
})
5455

5556
ginkgo.Context("NetworkPolicy between server and client", func() {

‎test/e2e/network/network_tiers.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/kubernetes/test/e2e/framework"
3232
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
3333
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
gcecloud "k8s.io/legacy-cloud-providers/gce"
3536

3637
"github.com/onsi/ginkgo"
@@ -44,7 +45,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
4445

4546
ginkgo.BeforeEach(func() {
4647
// This test suite requires the GCE environment.
47-
framework.SkipUnlessProviderIs("gce")
48+
e2eskipper.SkipUnlessProviderIs("gce")
4849
cs = f.ClientSet
4950
})
5051

‎test/e2e/network/networking.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
33+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3334
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
3435

3536
"github.com/onsi/ginkgo"
@@ -111,7 +112,7 @@ var _ = SIGDescribe("Networking", func() {
111112

112113
ginkgo.It("should provide Internet connection for containers [Feature:Networking-IPv6][Experimental][LinuxOnly]", func() {
113114
// IPv6 is not supported on Windows.
114-
framework.SkipIfNodeOSDistroIs("windows")
115+
e2eskipper.SkipIfNodeOSDistroIs("windows")
115116
ginkgo.By("Running container which tries to connect to 2001:4860:4860::8888")
116117
framework.ExpectNoError(
117118
checkConnectivityToHost(f, "", "connectivity-test", "2001:4860:4860::8888", 53, 30))
@@ -311,8 +312,8 @@ var _ = SIGDescribe("Networking", func() {
311312
})
312313

313314
ginkgo.It("should recreate its iptables rules if they are deleted [Disruptive]", func() {
314-
framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
315-
framework.SkipUnlessSSHKeyPresent()
315+
e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
316+
e2eskipper.SkipUnlessSSHKeyPresent()
316317

317318
hosts, err := e2essh.NodeSSHHosts(f.ClientSet)
318319
framework.ExpectNoError(err, "failed to find external/internal IPs for every node")

0 commit comments

Comments
 (0)