Add e2e node test for log path #34877
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,28 +13,8 @@ load( | |
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "bindata.go", | ||
| "main.go", | ||
| ], | ||
| tags = ["automanaged"], | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package e2e_node | ||
|
|
||
| import ( | ||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/kubelet" | ||
| kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||
| "k8s.io/kubernetes/pkg/util/uuid" | ||
| "k8s.io/kubernetes/test/e2e/framework" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| ) | ||
|
|
||
| const logString = "This is the expected log content of this node e2e test" | ||
|
|
||
| var _ = framework.KubeDescribe("ContainerLogPath", func() { | ||
| f := framework.NewDefaultFramework("kubelet-container-log-path") | ||
| Describe("Pod with a container", func() { | ||
| Context("printed log to stdout", func() { | ||
| It("should print log to correct log path", func() { | ||
| podClient := f.PodClient() | ||
| ns := f.Namespace.Name | ||
|
|
||
| logDirVolumeName := "log-dir-vol" | ||
| logDir := kubelet.ContainerLogsDir | ||
|
|
||
| logPodName := "logger-" + string(uuid.NewUUID()) | ||
| logContName := "logger-c-" + string(uuid.NewUUID()) | ||
| checkPodName := "checker" + string(uuid.NewUUID()) | ||
| checkContName := "checker-c-" + string(uuid.NewUUID()) | ||
|
There was a problem hiding this comment. You don't need the UUID on any of these, since the each test is run in a separate namespace. |
||
|
|
||
| logPod := &api.Pod{ | ||
| ObjectMeta: api.ObjectMeta{ | ||
| Name: logPodName, | ||
| }, | ||
| Spec: api.PodSpec{ | ||
| // this pod is expected to exit successfully | ||
| RestartPolicy: api.RestartPolicyNever, | ||
| Containers: []api.Container{ | ||
| { | ||
| Image: "gcr.io/google_containers/busybox:1.24", | ||
| Name: logContName, | ||
| Command: []string{"sh", "-c", "echo " + logString}, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| podClient.Create(logPod) | ||
| err := framework.WaitForPodSuccessInNamespace(f.ClientSet, logPodName, ns) | ||
| framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", logPodName) | ||
|
|
||
| // get containerID from created Pod | ||
| createdLogPod, err := podClient.Get(logPodName) | ||
|
There was a problem hiding this comment. nit: The created pod is returned by |
||
| logConID := kubecontainer.ParseContainerID(createdLogPod.Status.ContainerStatuses[0].ContainerID) | ||
| framework.ExpectNoError(err, "Failed to get pod: %s", logPodName) | ||
|
|
||
| expectedlogFile := logDir + "/" + logPodName + "_" + ns + "_" + logContName + "-" + logConID.ID + ".log" | ||
|
|
||
| checkPod := &api.Pod{ | ||
| ObjectMeta: api.ObjectMeta{ | ||
| Name: checkPodName, | ||
| }, | ||
| Spec: api.PodSpec{ | ||
| // this pod is expected to exit successfully | ||
| RestartPolicy: api.RestartPolicyNever, | ||
| Containers: []api.Container{ | ||
| { | ||
| Image: "gcr.io/google_containers/busybox:1.24", | ||
| Name: checkContName, | ||
| // If we find expected log file and contains right content, exit 0 | ||
| // else, keep checking until test timeout | ||
| Command: []string{"sh", "-c", "while true; do if [ -e " + expectedlogFile + " ] && grep -q " + logString + " " + expectedlogFile + "; then exit 0; fi; sleep 1; done"}, | ||
| VolumeMounts: []api.VolumeMount{ | ||
| { | ||
| Name: logDirVolumeName, | ||
| // mount ContainerLogsDir to the same path in container | ||
| MountPath: expectedlogFile, | ||
| ReadOnly: true, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Volumes: []api.Volume{ | ||
| { | ||
| Name: logDirVolumeName, | ||
| VolumeSource: api.VolumeSource{ | ||
| HostPath: &api.HostPathVolumeSource{ | ||
| Path: expectedlogFile, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| podClient.Create(checkPod) | ||
| err = framework.WaitForPodSuccessInNamespace(f.ClientSet, checkPodName, ns) | ||
| framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", checkPodName) | ||
| }) | ||
| }) | ||
| }) | ||
| }) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change reverts non autogenerated build changes. It looks like you messed up a rebase. For the most part BUILD file changes should make sense in the context of the change you made. This doesn't make sense. If you see nonsensible changes please ping me.