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

Merge pull request #100128 from ingvagabund/sig-scheduling-single-node-e2e

Browse Source 
[sig-scheduling] SchedulerPreemption|SchedulerPredicates|SchedulerPriorities: adjust some e2e tests to run in a single node cluster scenario
This commit is contained in:
Kubernetes Prow Robot 2021-04-13 10:31:09 -07:00 committed by GitHub
commit 2147937c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/scheduling/predicates.go
View File

@ -718,6 +718,9 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
topologyKey := "kubernetes.io/e2e-pts-filter" topologyKey := "kubernetes.io/e2e-pts-filter"
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
if len(nodeList.Items) < 2 {
ginkgo.Skip("At least 2 nodes are required to run the test")
}
ginkgo.By("Trying to get 2 available nodes which can run pod") ginkgo.By("Trying to get 2 available nodes which can run pod")
nodeNames = Get2NodesThatCanRunPod(f) nodeNames = Get2NodesThatCanRunPod(f)
ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey)) ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey))

124
test/e2e/scheduling/preemption.go
View File

@ -121,48 +121,52 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.ConformanceIt("validates basic preemption works", func() { framework.ConformanceIt("validates basic preemption works", func() {
var podRes v1.ResourceList var podRes v1.ResourceList
// Create one pod per node that uses a lot of the node's resources. // Create two pods per node that uses a lot of the node's resources.
ginkgo.By("Create pods that use 2/3 of node resources.") ginkgo.By("Create pods that use 4/5 of node resources.")
pods := make([]*v1.Pod, 0, len(nodeList.Items)) pods := make([]*v1.Pod, 0, 2*len(nodeList.Items))
// Now create victim pods on each of the node with lower priority // Create pods in the cluster.
// One of them has low priority, making it the victim for preemption.
for i, node := range nodeList.Items { for i, node := range nodeList.Items {
// Update each node to advertise 3 available extended resources // Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3") nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
// Request 2 of the available resources for the victim pods for j := 0; j < 2; j++ {
podRes = v1.ResourceList{} // Request 2 of the available resources for the victim pods
podRes[testExtendedResource] = resource.MustParse("2") podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
// make the first pod low priority and the rest medium priority. // make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName priorityName := mediumPriorityClassName
if len(pods) == 0 { if len(pods) == 0 {
priorityName = lowPriorityClassName priorityName = lowPriorityClassName
} }
pods = append(pods, createPausePod(f, pausePodConfig{ pausePod := createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%v", i, priorityName), Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
PriorityClassName: priorityName, PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{ Resources: &v1.ResourceRequirements{
Requests: podRes, Requests: podRes,
Limits: podRes, Limits: podRes,
}, },
Affinity: &v1.Affinity{ Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{ NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{ RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{ NodeSelectorTerms: []v1.NodeSelectorTerm{
{ {
MatchFields: []v1.NodeSelectorRequirement{ MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}}, {Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
},
}, },
}, },
}, },
}, },
}, },
}, })
})) pods = append(pods, pausePod)
framework.Logf("Created pod: %v", pods[i].Name) framework.Logf("Created pod: %v", pausePod.Name)
}
} }
if len(pods) < 2 { if len(pods) < 2 {
framework.Failf("We need at least two pods to be created but " + framework.Failf("We need at least two pods to be created but " +
@ -209,46 +213,49 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.ConformanceIt("validates lower priority pod preemption by critical pod", func() { framework.ConformanceIt("validates lower priority pod preemption by critical pod", func() {
var podRes v1.ResourceList var podRes v1.ResourceList
ginkgo.By("Create pods that use 2/3 of node resources.") ginkgo.By("Create pods that use 4/5 of node resources.")
pods := make([]*v1.Pod, 0, len(nodeList.Items)) pods := make([]*v1.Pod, 0, len(nodeList.Items))
for i, node := range nodeList.Items { for i, node := range nodeList.Items {
// Update each node to advertise 3 available extended resources // Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3") nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
// Request 2 of the available resources for the victim pods for j := 0; j < 2; j++ {
podRes = v1.ResourceList{} // Request 2 of the available resources for the victim pods
podRes[testExtendedResource] = resource.MustParse("2") podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
// make the first pod low priority and the rest medium priority. // make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName priorityName := mediumPriorityClassName
if len(pods) == 0 { if len(pods) == 0 {
priorityName = lowPriorityClassName priorityName = lowPriorityClassName
} }
pods = append(pods, createPausePod(f, pausePodConfig{ pausePod := createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%v", i, priorityName), Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
PriorityClassName: priorityName, PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{ Resources: &v1.ResourceRequirements{
Requests: podRes, Requests: podRes,
Limits: podRes, Limits: podRes,
}, },
Affinity: &v1.Affinity{ Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{ NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{ RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{ NodeSelectorTerms: []v1.NodeSelectorTerm{
{ {
MatchFields: []v1.NodeSelectorRequirement{ MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}}, {Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
},
}, },
}, },
}, },
}, },
}, },
}, })
})) pods = append(pods, pausePod)
framework.Logf("Created pod: %v", pods[i].Name) framework.Logf("Created pod: %v", pausePod.Name)
}
} }
if len(pods) < 2 { if len(pods) < 2 {
framework.Failf("We need at least two pods to be created but " + framework.Failf("We need at least two pods to be created but " +
@ -306,6 +313,9 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
var fakeRes v1.ResourceName = "example.com/fakePTSRes" var fakeRes v1.ResourceName = "example.com/fakePTSRes"
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
if len(nodeList.Items) < 2 {
ginkgo.Skip("At least 2 nodes are required to run the test")
}
ginkgo.By("Trying to get 2 available nodes which can run pod") ginkgo.By("Trying to get 2 available nodes which can run pod")
nodeNames = Get2NodesThatCanRunPod(f) nodeNames = Get2NodesThatCanRunPod(f)
ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey)) ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey))

3
test/e2e/scheduling/priorities.go
View File

@ -388,6 +388,9 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
topologyKey := "kubernetes.io/e2e-pts-score" topologyKey := "kubernetes.io/e2e-pts-score"
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
if len(nodeList.Items) < 2 {
ginkgo.Skip("At least 2 nodes are required to run the test")
}
ginkgo.By("Trying to get 2 available nodes which can run pod") ginkgo.By("Trying to get 2 available nodes which can run pod")
nodeNames = Get2NodesThatCanRunPod(f) nodeNames = Get2NodesThatCanRunPod(f)
ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey)) ginkgo.By(fmt.Sprintf("Apply dedicated topologyKey %v for this test on the 2 nodes.", topologyKey))