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

Refactor kubectl retrieve logs test to use agnhost

Browse Source 
Windows is having trouble running this test because the Redis
port for Windows is older than the one used by the test, as
described in the issue #80265.

Changing the "Kubectl should retrieve and filter logs" test
to use the agnhost image to generate the logs.

Fixes: https://github.com/kubernetes/kubernetes/issues/80265
This commit is contained in:
Adelina Tuvenie 2019-07-24 14:43:03 +03:00
parent da3daf2e8a
commit f8a38220e3
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
test/e2e/kubectl/kubectl.go
View File

@ -108,6 +108,7 @@ var (
redisImage = imageutils.GetE2EImage(imageutils.Redis) redisImage = imageutils.GetE2EImage(imageutils.Redis)
nginxImage = imageutils.GetE2EImage(imageutils.Nginx) nginxImage = imageutils.GetE2EImage(imageutils.Nginx)
busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox) busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox)
agnhostImage = imageutils.GetE2EImage(imageutils.Agnhost)
) )
var ( var (
@ -1290,23 +1291,23 @@ metadata:
framework.KubeDescribe("Kubectl logs", func() { framework.KubeDescribe("Kubectl logs", func() {
var nsFlag string var nsFlag string
var rc string podName := "logs-generator"
containerName := "redis-master" containerName := "logs-generator"
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
ginkgo.By("creating an rc") ginkgo.By("creating an pod")
rc = commonutils.SubstituteImageName(string(readTestFileOrDie(redisControllerFilename)))
nsFlag = fmt.Sprintf("--namespace=%v", ns) nsFlag = fmt.Sprintf("--namespace=%v", ns)
framework.RunKubectlOrDieInput(rc, "create", "-f", "-", nsFlag) // Agnhost image generates logs for a total of 100 lines over 20s.
framework.RunKubectlOrDie("run", podName, "--generator=run-pod/v1", "--image="+agnhostImage, nsFlag, "--", "logs-generator", "--log-lines-total", "100", "--run-duration", "20s")
}) })
ginkgo.AfterEach(func() { ginkgo.AfterEach(func() {
cleanupKubectlInputs(rc, ns, simplePodSelector) framework.RunKubectlOrDie("delete", "pod", podName, nsFlag)
}) })
/* /*
Release : v1.9 Release : v1.9
Testname: Kubectl, logs Testname: Kubectl, logs
Description: When a Pod is running then it MUST generate logs. Description: When a Pod is running then it MUST generate logs.
Starting a Pod should have a log line indicating the server is running and ready to accept connections. Also log command options MUST work as expected and described below. Starting a Pod should have a expected log line. Also log command options MUST work as expected and described below.
‘kubectl log -tail=1’ should generate a output of one line, the last line in the log. ‘kubectl log -tail=1’ should generate a output of one line, the last line in the log.
‘kubectl --limit-bytes=1’ should generate a single byte output. ‘kubectl --limit-bytes=1’ should generate a single byte output.
‘kubectl --tail=1 --timestamp should generate one line with timestamp in RFC3339 format ‘kubectl --tail=1 --timestamp should generate one line with timestamp in RFC3339 format
@ -1320,46 +1321,47 @@ metadata:
return strings.Split(strings.TrimRight(out, "\n"), "\n") return strings.Split(strings.TrimRight(out, "\n"), "\n")
} }
ginkgo.By("Waiting for Redis master to start.") ginkgo.By("Waiting for log generator to start.")
waitForOrFailWithDebug(1) if !e2epod.CheckPodsRunningReadyOrSucceeded(c, ns, []string{podName}, framework.PodStartTimeout) {
forEachPod(func(pod v1.Pod) { e2elog.Failf("Pod %s was not ready", podName)
ginkgo.By("checking for a matching strings") }
_, err := framework.LookForStringInLog(ns, pod.Name, containerName, "Ready to accept connections", framework.PodStartTimeout)
framework.ExpectNoError(err)
ginkgo.By("limiting log lines") ginkgo.By("checking for a matching strings")
out := framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--tail=1") _, err := framework.LookForStringInLog(ns, podName, containerName, "/api/v1/namespaces/kube-system", framework.PodStartTimeout)
gomega.Expect(len(out)).NotTo(gomega.BeZero()) framework.ExpectNoError(err)
framework.ExpectEqual(len(lines(out)), 1)
ginkgo.By("limiting log bytes") ginkgo.By("limiting log lines")
out = framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--limit-bytes=1") out := framework.RunKubectlOrDie("log", podName, containerName, nsFlag, "--tail=1")
framework.ExpectEqual(len(lines(out)), 1) gomega.Expect(len(out)).NotTo(gomega.BeZero())
framework.ExpectEqual(len(out), 1) framework.ExpectEqual(len(lines(out)), 1)
ginkgo.By("exposing timestamps") ginkgo.By("limiting log bytes")
out = framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--tail=1", "--timestamps") out = framework.RunKubectlOrDie("log", podName, containerName, nsFlag, "--limit-bytes=1")
l := lines(out) framework.ExpectEqual(len(lines(out)), 1)
framework.ExpectEqual(len(l), 1) framework.ExpectEqual(len(out), 1)
words := strings.Split(l[0], " ")
gomega.Expect(len(words)).To(gomega.BeNumerically(">", 1)) ginkgo.By("exposing timestamps")
if _, err := time.Parse(time.RFC3339Nano, words[0]); err != nil { out = framework.RunKubectlOrDie("log", podName, containerName, nsFlag, "--tail=1", "--timestamps")
if _, err := time.Parse(time.RFC3339, words[0]); err != nil { l := lines(out)
e2elog.Failf("expected %q to be RFC3339 or RFC3339Nano", words[0]) framework.ExpectEqual(len(l), 1)
} words := strings.Split(l[0], " ")
gomega.Expect(len(words)).To(gomega.BeNumerically(">", 1))
if _, err := time.Parse(time.RFC3339Nano, words[0]); err != nil {
if _, err := time.Parse(time.RFC3339, words[0]); err != nil {
e2elog.Failf("expected %q to be RFC3339 or RFC3339Nano", words[0])
} }
}
ginkgo.By("restricting to a time range") ginkgo.By("restricting to a time range")
// Note: we must wait at least two seconds, // Note: we must wait at least two seconds,
// because the granularity is only 1 second and // because the granularity is only 1 second and
// it could end up rounding the wrong way. // it could end up rounding the wrong way.
time.Sleep(2500 * time.Millisecond) // ensure that startup logs on the node are seen as older than 1s time.Sleep(2500 * time.Millisecond) // ensure that startup logs on the node are seen as older than 1s
recentOut := framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--since=1s") recentOut := framework.RunKubectlOrDie("log", podName, containerName, nsFlag, "--since=1s")
recent := len(strings.Split(recentOut, "\n")) recent := len(strings.Split(recentOut, "\n"))
olderOut := framework.RunKubectlOrDie("log", pod.Name, containerName, nsFlag, "--since=24h") olderOut := framework.RunKubectlOrDie("log", podName, containerName, nsFlag, "--since=24h")
older := len(strings.Split(olderOut, "\n")) older := len(strings.Split(olderOut, "\n"))
gomega.Expect(recent).To(gomega.BeNumerically("<", older), "expected recent(%v) to be less than older(%v)\nrecent lines:\n%v\nolder lines:\n%v\n", recent, older, recentOut, olderOut) gomega.Expect(recent).To(gomega.BeNumerically("<", older), "expected recent(%v) to be less than older(%v)\nrecent lines:\n%v\nolder lines:\n%v\n", recent, older, recentOut, olderOut)
})
}) })
}) })