Skip to content

K
k3s
Commit 5b95099e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36780 from yujuhong/use_labels

Automatic merge from submit-queue e2e pod cleanup test: restrict pods to be assigned to nodes observed … The test checks the individual kubelet /runningPods endpoint based on the initial list of nodes it observes. It is important that all pods are scheduled only onto those nodes. Apply node labels to ensure no stray pods on other nodes. This fixes #35197
parents 723690c5 d80f9e80
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
test/e2e/kubelet.go
View file @ 5b95099e
......@@ -137,19 +137,20 @@ var _ = framework.KubeDescribe("kubelet", func() {
BeforeEach(func() {
c = f.ClientSet
// Use node labels to restrict the pods to be assigned only to the
// nodes we observe initially.
nodeLabels = make(map[string]string)
nodeLabels["kubelet_cleanup"] = "true"
nodes := framework.GetReadySchedulableNodesOrDie(c)
numNodes = len(nodes.Items)
nodeNames = sets.NewString()
// If there are a lot of nodes, we don't want to use all of them
// (if there are 1000 nodes in the cluster, starting 10 pods/node
// will take ~10 minutes today). And there is also deletion phase.
//
// Instead, we choose at most 10 nodes and will constraint pods
// that we are creating to be scheduled only on that nodes.
// Instead, we choose at most 10 nodes.
if numNodes > maxNodesToCheck {
numNodes = maxNodesToCheck
nodeLabels = make(map[string]string)
nodeLabels["kubelet_cleanup"] = "true"
}
for i := 0; i < numNodes; i++ {
nodeNames.Insert(nodes.Items[i].Name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment