mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 07:20:13 +00:00
Merge pull request #122240 from aravindhp/nlq-only-select-linux-nodes
e2e: only select linux nodes for NodeLogQuery tests
This commit is contained in:
commit
2c96352cc4
@ -464,8 +464,13 @@ var _ = SIGDescribe("kubelet", func() {
|
||||
nodes, err := e2enode.GetReadyNodesIncludingTainted(ctx, c)
|
||||
framework.ExpectNoError(err)
|
||||
if len(nodes.Items) == 0 {
|
||||
framework.Fail("Expected at least one node to be present")
|
||||
}
|
||||
linuxNodes := getLinuxNodes(nodes)
|
||||
if len(linuxNodes.Items) == 0 {
|
||||
framework.Fail("Expected at least one Linux node to be present")
|
||||
}
|
||||
|
||||
linuxNodeName = nodes.Items[0].Name
|
||||
})
|
||||
|
||||
@ -579,6 +584,23 @@ var _ = SIGDescribe("kubelet", func() {
|
||||
})
|
||||
})
|
||||
|
||||
func getLinuxNodes(nodes *v1.NodeList) *v1.NodeList {
|
||||
e2enode.Filter(nodes, func(node v1.Node) bool {
|
||||
return isLinuxNode(&node)
|
||||
})
|
||||
return nodes
|
||||
}
|
||||
|
||||
func isLinuxNode(node *v1.Node) bool {
|
||||
if node == nil {
|
||||
return false
|
||||
}
|
||||
if os, found := node.Labels[v1.LabelOSStable]; found {
|
||||
return (os == "linux")
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func runKubectlCommand(cmd *exec.Cmd) (result string) {
|
||||
stdout, stderr, err := framework.StartCmdAndStreamOutput(cmd)
|
||||
var buf bytes.Buffer
|
||||
|
Loading…
Reference in New Issue
Block a user