Skip to content

Commit ff7b07c

Browse files
removed equivalence cache tests
fix build
1 parent 8dea331 commit ff7b07c

File tree

4 files changed

+28
-309
lines changed

4 files changed

+28
-309
lines changed

test/e2e/autoscaling/cluster_size_autoscaling.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,8 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
574574
framework.AddOrUpdateLabelOnNode(c, node, labelKey, labelValue)
575575
}
576576

577-
scheduling.CreateNodeSelectorPods(f, "node-selector", minSize+1, map[string]string{labelKey: labelValue}, false)
578-
577+
err = scheduling.CreateNodeSelectorPods(f, "node-selector", minSize+1, map[string]string{labelKey: labelValue}, false)
578+
framework.ExpectNoError(err)
579579
ginkgo.By("Waiting for new node to appear and annotating it")
580580
framework.WaitForGroupSize(minMig, int32(minSize+1))
581581
// Verify that cluster size is increased

test/e2e/scheduling/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
33
go_library(
44
name = "go_default_library",
55
srcs = [
6-
"equivalence_cache_predicates.go",
76
"events.go",
87
"framework.go",
98
"limit_range.go",
@@ -19,7 +18,6 @@ go_library(
1918
importpath = "k8s.io/kubernetes/test/e2e/scheduling",
2019
visibility = ["//visibility:public"],
2120
deps = [
22-
"//pkg/apis/core:go_default_library",
2321
"//pkg/apis/core/v1/helper/qos:go_default_library",
2422
"//pkg/apis/extensions:go_default_library",
2523
"//pkg/apis/scheduling:go_default_library",

test/e2e/scheduling/equivalence_cache_predicates.go

Lines changed: 0 additions & 304 deletions
This file was deleted.

test/e2e/scheduling/predicates.go

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ import (
3838
imageutils "k8s.io/kubernetes/test/utils/image"
3939

4040
"github.com/onsi/ginkgo"
41+
4142
// ensure libs have a chance to initialize
4243
_ "github.com/stretchr/testify/assert"
4344
)
4445

45-
const maxNumberOfPods int64 = 10
46+
const (
47+
maxNumberOfPods int64 = 10
48+
defaultTimeout = 3 * time.Minute
49+
)
4650

4751
var localStorageVersion = utilversion.MustParseSemantic("v1.8.0-beta.0")
4852

@@ -807,6 +811,27 @@ func CreateHostPortPods(f *framework.Framework, id string, replicas int, expectR
807811
}
808812
}
809813

814+
// CreateNodeSelectorPods creates RC with host port 4321 and defines node selector
815+
func CreateNodeSelectorPods(f *framework.Framework, id string, replicas int, nodeSelector map[string]string, expectRunning bool) error {
816+
ginkgo.By(fmt.Sprintf("Running RC which reserves host port and defines node selector"))
817+
818+
config := &testutils.RCConfig{
819+
Client: f.ClientSet,
820+
Name: id,
821+
Namespace: f.Namespace.Name,
822+
Timeout: defaultTimeout,
823+
Image: imageutils.GetPauseImageName(),
824+
Replicas: replicas,
825+
HostPorts: map[string]int{"port1": 4321},
826+
NodeSelector: nodeSelector,
827+
}
828+
err := framework.RunRC(*config)
829+
if expectRunning {
830+
return err
831+
}
832+
return nil
833+
}
834+
810835
// create pod which using hostport on the specified node according to the nodeSelector
811836
func createHostPortPodOnNode(f *framework.Framework, podName, ns, hostIP string, port int32, protocol v1.Protocol, nodeSelector map[string]string, expectScheduled bool) {
812837
hostIP = framework.TranslateIPv4ToIPv6(hostIP)

0 commit comments

Comments
 (0)