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

Merge pull request #119571 from haircommander/node-log-query-on-node

Browse Source 
test: fix NodeLogQuery tests to query the correct node for logs
This commit is contained in:
Kubernetes Prow Robot 2023-07-25 15:36:31 -07:00 committed by GitHub
commit dc6d8c6b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/node/kubelet.go
View File

@ -574,7 +574,7 @@ var _ = SIGDescribe("kubelet", func() {
queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3\"" queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3\""
cmd := tk.KubectlCmd("get", "--raw", queryCommand) cmd := tk.KubectlCmd("get", "--raw", queryCommand)
result := runKubectlCommand(cmd) result := runKubectlCommand(cmd)
logs := journalctlCommand("-u", "kubelet", "-n 3 --utc") logs := journalctlCommandOnNode(nodeName, "-u kubelet -n 3 --utc")
if result != logs { if result != logs {
framework.Failf("Failed to receive the correct kubelet logs or the correct amount of lines of logs") framework.Failf("Failed to receive the correct kubelet logs or the correct amount of lines of logs")
} }
@ -593,7 +593,7 @@ var _ = SIGDescribe("kubelet", func() {
queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&boot=0&pattern=kubelet\"" queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&boot=0&pattern=kubelet\""
cmd := tk.KubectlCmd("get", "--raw", queryCommand) cmd := tk.KubectlCmd("get", "--raw", queryCommand)
result := runKubectlCommand(cmd) result := runKubectlCommand(cmd)
logs := journalctlCommand("-u", "kubelet", "-n 3 --utc") logs := journalctlCommandOnNode(nodeName, "-u kubelet -n 3 --utc")
if result != logs { if result != logs {
framework.Failf("Failed to receive the correct kubelet logs") framework.Failf("Failed to receive the correct kubelet logs")
} }
@ -613,7 +613,7 @@ var _ = SIGDescribe("kubelet", func() {
queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&sinceTime=" + start.Format(time.RFC3339) + "\"" queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&sinceTime=" + start.Format(time.RFC3339) + "\""
cmd := tk.KubectlCmd("get", "--raw", queryCommand) cmd := tk.KubectlCmd("get", "--raw", queryCommand)
result := runKubectlCommand(cmd) result := runKubectlCommand(cmd)
logs := journalctlCommand("-u", "kubelet", "-n 3 --utc") logs := journalctlCommandOnNode(nodeName, "-u kubelet -n 3 --utc")
if result != logs { if result != logs {
framework.Failf("Failed to receive the correct kubelet logs or the correct amount of lines of logs") framework.Failf("Failed to receive the correct kubelet logs or the correct amount of lines of logs")
} }
@ -634,7 +634,7 @@ var _ = SIGDescribe("kubelet", func() {
queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&sinceTime=" + start.Format(time.RFC3339) + "\"" queryCommand := "\"/api/v1/nodes/" + nodeName + "/proxy/logs/?query=kubelet&tailLines=3&sinceTime=" + start.Format(time.RFC3339) + "\""
cmd := tk.KubectlCmd("get", "--raw", queryCommand) cmd := tk.KubectlCmd("get", "--raw", queryCommand)
result := runKubectlCommand(cmd) result := runKubectlCommand(cmd)
logs := journalctlCommand("-u", "kubelet", "--utc") logs := journalctlCommandOnNode(nodeName, "-u kubelet --utc")
assertContains(result, logs) assertContains(result, logs)
} }
}) })
@ -672,13 +672,9 @@ func assertContains(expectedString string, result string) {
return return
} }
func journalctlCommand(arg ...string) string { func journalctlCommandOnNode(nodeName string, args string) string {
command := exec.Command("journalctl", arg...) result, err := e2essh.NodeExec(context.Background(), nodeName, "journalctl "+args, framework.TestContext.Provider)
out, err := command.Output() framework.ExpectNoError(err)
if err != nil { e2essh.LogResult(result)
framework.Logf("Command: %v\nError: %v", command, err) return result.Stdout
framework.Failf("Error at running journalctl command")
}
framework.Logf("Journalctl output: %s", out)
return string(out)
} }