Fix nits in node e2e log path

This commit is contained in:
Harry Zhang 2016-11-11 03:23:30 -05:00
parent 545f749a0d
commit 3002f5719d

View File

@ -20,13 +20,19 @@ import (
"k8s.io/kubernetes/pkg/api/v1"
"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"
const (
logString = "This is the expected log content of this node e2e test"
logPodName = "logger-pod"
logContName = "logger-container"
checkPodName = "checker-pod"
checkContName = "checker-container"
)
var _ = framework.KubeDescribe("ContainerLogPath", func() {
f := framework.NewDefaultFramework("kubelet-container-log-path")
@ -39,11 +45,6 @@ var _ = framework.KubeDescribe("ContainerLogPath", func() {
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())
logPod := &v1.Pod{
ObjectMeta: v1.ObjectMeta{
Name: logPodName,