Skip to content

Commit c402a4b

Browse files
YuikoTakadaYuikoTakada
committed
WIP: use e2eskipper package in test/e2e/autoscaling
1 parent 387e693 commit c402a4b

File tree

6 files changed

+28
-22
lines changed

6 files changed

+28
-22
lines changed

‎test/e2e/autoscaling/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ go_library(
4545
"//test/e2e/framework/pod:go_default_library",
4646
"//test/e2e/framework/pv:go_default_library",
4747
"//test/e2e/framework/rc:go_default_library",
48+
"//test/e2e/framework/skipper:go_default_library",
4849
"//test/e2e/instrumentation/monitoring:go_default_library",
4950
"//test/e2e/scheduling:go_default_library",
5051
"//test/utils:go_default_library",

‎test/e2e/autoscaling/autoscaling_timer.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"k8s.io/kubernetes/test/e2e/framework"
2626
e2eautoscaling "k8s.io/kubernetes/test/e2e/framework/autoscaling"
2727
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
28+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2829

2930
"github.com/onsi/ginkgo"
3031
)
@@ -37,7 +38,7 @@ var _ = SIGDescribe("[Feature:ClusterSizeAutoscalingScaleUp] [Slow] Autoscaling"
3738
// Check if Cloud Autoscaler is enabled by trying to get its ConfigMap.
3839
_, err := f.ClientSet.CoreV1().ConfigMaps("kube-system").Get("cluster-autoscaler-status", metav1.GetOptions{})
3940
if err != nil {
40-
framework.Skipf("test expects Cluster Autoscaler to be enabled")
41+
e2eskipper.Skipf("test expects Cluster Autoscaler to be enabled")
4142
}
4243
})
4344

@@ -50,15 +51,15 @@ var _ = SIGDescribe("[Feature:ClusterSizeAutoscalingScaleUp] [Slow] Autoscaling"
5051
// Make sure there is only 1 node group, otherwise this test becomes useless.
5152
nodeGroups := strings.Split(framework.TestContext.CloudConfig.NodeInstanceGroup, ",")
5253
if len(nodeGroups) != 1 {
53-
framework.Skipf("test expects 1 node group, found %d", len(nodeGroups))
54+
e2eskipper.Skipf("test expects 1 node group, found %d", len(nodeGroups))
5455
}
5556
nodeGroupName = nodeGroups[0]
5657

5758
// Make sure the node group has exactly 'nodesNum' nodes, otherwise this test becomes useless.
5859
nodeGroupSize, err := framework.GroupSize(nodeGroupName)
5960
framework.ExpectNoError(err)
6061
if nodeGroupSize != nodesNum {
61-
framework.Skipf("test expects %d nodes, found %d", nodesNum, nodeGroupSize)
62+
e2eskipper.Skipf("test expects %d nodes, found %d", nodesNum, nodeGroupSize)
6263
}
6364

6465
// Make sure all nodes are schedulable, otherwise we are in some kind of a problem state.

‎test/e2e/autoscaling/cluster_autoscaler_scalability.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/kubernetes/test/e2e/framework"
3434
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3535
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
36+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3637
testutils "k8s.io/kubernetes/test/utils"
3738
imageutils "k8s.io/kubernetes/test/utils/image"
3839

@@ -67,12 +68,12 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun
6768
var sum int
6869

6970
ginkgo.BeforeEach(func() {
70-
framework.SkipUnlessProviderIs("gce", "gke", "kubemark")
71+
e2eskipper.SkipUnlessProviderIs("gce", "gke", "kubemark")
7172

7273
// Check if Cloud Autoscaler is enabled by trying to get its ConfigMap.
7374
_, err := f.ClientSet.CoreV1().ConfigMaps("kube-system").Get("cluster-autoscaler-status", metav1.GetOptions{})
7475
if err != nil {
75-
framework.Skipf("test expects Cluster Autoscaler to be enabled")
76+
e2eskipper.Skipf("test expects Cluster Autoscaler to be enabled")
7677
}
7778

7879
c = f.ClientSet

‎test/e2e/autoscaling/cluster_size_autoscaling.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import (
4848
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
4949
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
5050
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
51+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
5152
"k8s.io/kubernetes/test/e2e/scheduling"
5253
testutils "k8s.io/kubernetes/test/utils"
5354
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -98,7 +99,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
9899

99100
ginkgo.BeforeEach(func() {
100101
c = f.ClientSet
101-
framework.SkipUnlessProviderIs("gce", "gke")
102+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
102103

103104
originalSizes = make(map[string]int)
104105
sum := 0
@@ -138,7 +139,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
138139
})
139140

140141
ginkgo.AfterEach(func() {
141-
framework.SkipUnlessProviderIs("gce", "gke")
142+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
142143
ginkgo.By(fmt.Sprintf("Restoring initial size of the cluster"))
143144
setMigSizes(originalSizes)
144145
expectedNodes := 0
@@ -210,7 +211,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
210211
gpuType := os.Getenv("TESTED_GPU_TYPE")
211212

212213
ginkgo.It(fmt.Sprintf("Should scale up GPU pool from 0 [GpuType:%s] [Feature:ClusterSizeAutoscalingGpu]", gpuType), func() {
213-
framework.SkipUnlessProviderIs("gke")
214+
e2eskipper.SkipUnlessProviderIs("gke")
214215
if gpuType == "" {
215216
framework.Failf("TEST_GPU_TYPE not defined")
216217
return
@@ -237,7 +238,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
237238
})
238239

239240
ginkgo.It(fmt.Sprintf("Should scale up GPU pool from 1 [GpuType:%s] [Feature:ClusterSizeAutoscalingGpu]", gpuType), func() {
240-
framework.SkipUnlessProviderIs("gke")
241+
e2eskipper.SkipUnlessProviderIs("gke")
241242
if gpuType == "" {
242243
framework.Failf("TEST_GPU_TYPE not defined")
243244
return
@@ -267,7 +268,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
267268
})
268269

269270
ginkgo.It(fmt.Sprintf("Should not scale GPU pool up if pod does not require GPUs [GpuType:%s] [Feature:ClusterSizeAutoscalingGpu]", gpuType), func() {
270-
framework.SkipUnlessProviderIs("gke")
271+
e2eskipper.SkipUnlessProviderIs("gke")
271272
if gpuType == "" {
272273
framework.Failf("TEST_GPU_TYPE not defined")
273274
return
@@ -296,7 +297,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
296297
})
297298

298299
ginkgo.It(fmt.Sprintf("Should scale down GPU pool from 1 [GpuType:%s] [Feature:ClusterSizeAutoscalingGpu]", gpuType), func() {
299-
framework.SkipUnlessProviderIs("gke")
300+
e2eskipper.SkipUnlessProviderIs("gke")
300301
if gpuType == "" {
301302
framework.Failf("TEST_GPU_TYPE not defined")
302303
return
@@ -371,7 +372,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
371372
})
372373

373374
ginkgo.It("should increase cluster size if pending pods are small and there is another node pool that is not autoscaled [Feature:ClusterSizeAutoscalingScaleUp]", func() {
374-
framework.SkipUnlessProviderIs("gke")
375+
e2eskipper.SkipUnlessProviderIs("gke")
375376

376377
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
377378
const extraPoolName = "extra-pool"
@@ -405,7 +406,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
405406
})
406407

407408
ginkgo.It("should disable node pool autoscaling [Feature:ClusterSizeAutoscalingScaleUp]", func() {
408-
framework.SkipUnlessProviderIs("gke")
409+
e2eskipper.SkipUnlessProviderIs("gke")
409410

410411
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
411412
const extraPoolName = "extra-pool"
@@ -467,7 +468,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
467468
})
468469

469470
ginkgo.It("should increase cluster size if pod requesting volume is pending [Feature:ClusterSizeAutoscalingScaleUp]", func() {
470-
framework.SkipUnlessProviderIs("gce", "gke")
471+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
471472

472473
volumeLabels := labels.Set{
473474
e2epv.VolumeSelectorKey: f.Namespace.Name,
@@ -639,7 +640,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
639640
})
640641

641642
ginkgo.It("should scale up correct target pool [Feature:ClusterSizeAutoscalingScaleUp]", func() {
642-
framework.SkipUnlessProviderIs("gke")
643+
e2eskipper.SkipUnlessProviderIs("gke")
643644

644645
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
645646
const extraPoolName = "extra-pool"
@@ -689,12 +690,12 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
689690

690691
ginkgo.It("should correctly scale down after a node is not needed and one node is broken [Feature:ClusterSizeAutoscalingScaleDown]",
691692
func() {
692-
framework.SkipUnlessSSHKeyPresent()
693+
e2eskipper.SkipUnlessSSHKeyPresent()
693694
e2enetwork.TestUnderTemporaryNetworkFailure(c, "default", getAnyNode(c), func() { simpleScaleDownTest(1) })
694695
})
695696

696697
ginkgo.It("should correctly scale down after a node is not needed when there is non autoscaled pool[Feature:ClusterSizeAutoscalingScaleDown]", func() {
697-
framework.SkipUnlessProviderIs("gke")
698+
e2eskipper.SkipUnlessProviderIs("gke")
698699

699700
increasedSize := manuallyIncreaseClusterSize(f, originalSizes)
700701

@@ -761,7 +762,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
761762
defer disableAutoscaler(extraPoolName, 0, 1)
762763
} else {
763764
// on GCE, run only if there are already at least 2 node groups
764-
framework.SkipUnlessAtLeast(len(originalSizes), 2, "At least 2 node groups are needed for scale-to-0 tests")
765+
e2eskipper.SkipUnlessAtLeast(len(originalSizes), 2, "At least 2 node groups are needed for scale-to-0 tests")
765766

766767
ginkgo.By("Manually scale smallest node group to 0")
767768
minMig := ""
@@ -877,12 +878,12 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
877878
} else if len(originalSizes) >= 2 {
878879
gceScaleToZero()
879880
} else {
880-
framework.Skipf("At least 2 node groups are needed for scale-to-0 tests")
881+
e2eskipper.Skipf("At least 2 node groups are needed for scale-to-0 tests")
881882
}
882883
})
883884

884885
ginkgo.It("Shouldn't perform scale up operation and should list unhealthy status if most of the cluster is broken[Feature:ClusterSizeAutoscalingScaleUp]", func() {
885-
framework.SkipUnlessSSHKeyPresent()
886+
e2eskipper.SkipUnlessSSHKeyPresent()
886887

887888
clusterSize := nodeCount
888889
for clusterSize < unhealthyClusterThreshold+1 {

‎test/e2e/autoscaling/custom_metrics_stackdriver_autoscaling.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
clientset "k8s.io/client-go/kubernetes"
3232
"k8s.io/kubernetes/test/e2e/framework"
33+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3334
"k8s.io/kubernetes/test/e2e/instrumentation/monitoring"
3435

3536
"github.com/onsi/ginkgo"
@@ -45,7 +46,7 @@ const (
4546

4647
var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: Custom Metrics from Stackdriver)", func() {
4748
ginkgo.BeforeEach(func() {
48-
framework.SkipUnlessProviderIs("gce", "gke")
49+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
4950
})
5051

5152
f := framework.NewDefaultFramework("horizontal-pod-autoscaling")

‎test/e2e/autoscaling/dns_autoscaling.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
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3333
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435

3536
"github.com/onsi/ginkgo"
3637
)
@@ -53,7 +54,7 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
5354
var DNSParams3 DNSParamsLinear
5455

5556
ginkgo.BeforeEach(func() {
56-
framework.SkipUnlessProviderIs("gce", "gke")
57+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
5758
c = f.ClientSet
5859

5960
nodes, err := e2enode.GetReadySchedulableNodes(c)

0 commit comments

Comments
 (0)