github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: e2e-node: refactor node-problem-detector test to avoid selinux issues

pull/6/head
Seth Jennings 2017-03-20 16:18:18 -05:00
parent 72207db455
commit 8f6f6bf141
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e_node/node_problem_detector_linux.go
View File

@ -22,7 +22,6 @@ import (
"fmt" "fmt"
"os" "os"
"path" "path"
"path/filepath"
"syscall" "syscall"
"time" "time"
@ -90,7 +89,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
permReason2 = "Permanent2" permReason2 = "Permanent2"
permMessage2 = "permanent error 2" permMessage2 = "permanent error 2"
) )
var source, config, tmpLogFile string var source, config, hostLogFile string
var lookback time.Duration var lookback time.Duration
var eventListOptions metav1.ListOptions var eventListOptions metav1.ListOptions
@ -153,9 +152,6 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
}.AsSelector().String() }.AsSelector().String()
eventListOptions = metav1.ListOptions{FieldSelector: selector} eventListOptions = metav1.ListOptions{FieldSelector: selector}
By("Create the test log file") By("Create the test log file")
tmpLogFile = filepath.Join("/tmp", name, path.Base(logFile))
os.MkdirAll(path.Dir(tmpLogFile), 755)
_, err = os.Create(tmpLogFile)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Create config map for the node problem detector") By("Create config map for the node problem detector")
_, err = c.Core().ConfigMaps(ns).Create(&v1.ConfigMap{ _, err = c.Core().ConfigMaps(ns).Create(&v1.ConfigMap{
@ -183,7 +179,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
{ {
Name: logVolume, Name: logVolume,
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: path.Dir(tmpLogFile)}, EmptyDir: &v1.EmptyDirVolumeSource{},
}, },
}, },
{ {
@ -197,7 +193,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
{ {
Name: name, Name: name,
Image: image, Image: image,
Command: []string{"/node-problem-detector", "--logtostderr", "--system-log-monitors=" + configFile, fmt.Sprintf("--apiserver-override=%s?inClusterConfig=false", framework.TestContext.Host)}, Command: []string{"sh", "-c", "touch " + logFile + " && /node-problem-detector --logtostderr --system-log-monitors=" + configFile + fmt.Sprintf(" --apiserver-override=%s?inClusterConfig=false", framework.TestContext.Host)},
Env: []v1.EnvVar{ Env: []v1.EnvVar{
{ {
Name: "NODE_NAME", Name: "NODE_NAME",
@ -227,6 +223,11 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
}, },
}, },
}) })
pod, err := f.PodClient().Get(name, metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())
// TODO: remove hardcoded kubelet volume directory path
// framework.TestContext.KubeVolumeDir is currently not populated for node e2e
hostLogFile = "/var/lib/kubelet/pods/" + string(pod.UID) + "/volumes/kubernetes.io~empty-dir" + logFile
}) })
It("should generate node condition and events for corresponding errors", func() { It("should generate node condition and events for corresponding errors", func() {
@ -318,7 +319,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
By(test.description) By(test.description)
if test.messageNum > 0 { if test.messageNum > 0 {
By(fmt.Sprintf("Inject %d logs: %q", test.messageNum, test.message)) By(fmt.Sprintf("Inject %d logs: %q", test.messageNum, test.message))
err := injectLog(tmpLogFile, test.timestamp, test.message, test.messageNum) err := injectLog(hostLogFile, test.timestamp, test.message, test.messageNum)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
@ -360,8 +361,6 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
By("Clean up the node condition") By("Clean up the node condition")
patch := []byte(fmt.Sprintf(`{"status":{"conditions":[{"$patch":"delete","type":"%s"}]}}`, condition)) patch := []byte(fmt.Sprintf(`{"status":{"conditions":[{"$patch":"delete","type":"%s"}]}}`, condition))
c.Core().RESTClient().Patch(types.StrategicMergePatchType).Resource("nodes").Name(framework.TestContext.NodeName).SubResource("status").Body(patch).Do() c.Core().RESTClient().Patch(types.StrategicMergePatchType).Resource("nodes").Name(framework.TestContext.NodeName).SubResource("status").Body(patch).Do()
By("Clean up the temporary directory")
Expect(os.RemoveAll(path.Dir(tmpLogFile))).To(Succeed())
}) })
}) })
}) })