e2e-node: refactor lifecycle test to avoid selinux issues

test/e2e_node/lifecycle_hook_test.go

@@ -17,12 +17,10 @@ limitations under the License.
 package e2e_node
 
 import (
-	"fmt"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
 
@@ -35,79 +33,10 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 	var podClient *framework.PodClient
 	const (
 		podCheckInterval     = 1 * time.Second
-		podWaitTimeout       = 3 * time.Minute
 		postStartWaitTimeout = 2 * time.Minute
 		preStopWaitTimeout   = 30 * time.Second
 	)
 	Context("when create a pod with lifecycle hook", func() {
-		BeforeEach(func() {
-			podClient = f.PodClient()
-		})
-
-		Context("when it is exec hook", func() {
-			var file string
-			testPodWithExecHook := func(podWithHook *v1.Pod) {
-				podCheckHook := getExecHookTestPod("pod-check-hook",
-					// Wait until the file is created.
-					[]string{"sh", "-c", fmt.Sprintf("while [ ! -e %s ]; do sleep 1; done", file)},
-				)
-				By("create the pod with lifecycle hook")
-				podClient.CreateSync(podWithHook)
-				if podWithHook.Spec.Containers[0].Lifecycle.PostStart != nil {
-					By("create the hook check pod")
-					podClient.Create(podCheckHook)
-					By("wait for the hook check pod to success")
-					podClient.WaitForSuccess(podCheckHook.Name, postStartWaitTimeout)
-				}
-				By("delete the pod with lifecycle hook")
-				podClient.DeleteSync(podWithHook.Name, metav1.NewDeleteOptions(15), framework.DefaultPodDeletionTimeout)
-				if podWithHook.Spec.Containers[0].Lifecycle.PreStop != nil {
-					By("create the hook check pod")
-					podClient.Create(podCheckHook)
-					By("wait for the prestop check pod to success")
-					podClient.WaitForSuccess(podCheckHook.Name, preStopWaitTimeout)
-				}
-			}
-
-			BeforeEach(func() {
-				file = "/tmp/test-" + string(uuid.NewUUID())
-			})
-
-			AfterEach(func() {
-				By("cleanup the temporary file created in the test.")
-				cleanupPod := getExecHookTestPod("pod-clean-up", []string{"rm", file})
-				podClient.Create(cleanupPod)
-				podClient.WaitForSuccess(cleanupPod.Name, podWaitTimeout)
-			})
-
-			It("should execute poststart exec hook properly [Conformance]", func() {
-				podWithHook := getExecHookTestPod("pod-with-poststart-exec-hook",
-					// Block forever
-					[]string{"tail", "-f", "/dev/null"},
-				)
-				podWithHook.Spec.Containers[0].Lifecycle = &v1.Lifecycle{
-					PostStart: &v1.Handler{
-						Exec: &v1.ExecAction{Command: []string{"touch", file}},
-					},
-				}
-				testPodWithExecHook(podWithHook)
-			})
-
-			It("should execute prestop exec hook properly [Conformance]", func() {
-				podWithHook := getExecHookTestPod("pod-with-prestop-exec-hook",
-					// Block forever
-					[]string{"tail", "-f", "/dev/null"},
-				)
-				podWithHook.Spec.Containers[0].Lifecycle = &v1.Lifecycle{
-					PreStop: &v1.Handler{
-						Exec: &v1.ExecAction{Command: []string{"touch", file}},
-					},
-				}
-				testPodWithExecHook(podWithHook)
-			})
-		})
-
-		Context("when it is http hook", func() {
 		var targetIP string
 		podHandleHookRequest := &v1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
@@ -129,11 +58,12 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 			},
 		}
 		BeforeEach(func() {
+			podClient = f.PodClient()
 			By("create the container to handle the HTTPGet hook request.")
 			newPod := podClient.CreateSync(podHandleHookRequest)
 			targetIP = newPod.Status.PodIP
 		})
-			testPodWithHttpHook := func(podWithHook *v1.Pod) {
+		testPodWithHook := func(podWithHook *v1.Pod) {
 			By("create the pod with lifecycle hook")
 			podClient.CreateSync(podWithHook)
 			if podWithHook.Spec.Containers[0].Lifecycle.PostStart != nil {
@@ -153,17 +83,30 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 				}, preStopWaitTimeout, podCheckInterval).Should(BeNil())
 			}
 		}
-			It("should execute poststart http hook properly [Conformance]", func() {
+		It("should execute poststart exec hook properly [Conformance]", func() {
-				podWithHook := &v1.Pod{
+			lifecycle := &v1.Lifecycle{
-					ObjectMeta: metav1.ObjectMeta{
+				PostStart: &v1.Handler{
-						Name: "pod-with-poststart-http-hook",
+					Exec: &v1.ExecAction{
+						Command: []string{"sh", "-c", "curl http://" + targetIP + ":8080/echo?msg=poststart"},
 					},
-					Spec: v1.PodSpec{
+				},
-						Containers: []v1.Container{
+			}
-							{
+			podWithHook := getPodWithHook("pod-with-poststart-exec-hook", "gcr.io/google_containers/hostexec:1.2", lifecycle)
-								Name:  "pod-with-poststart-http-hook",
+			testPodWithHook(podWithHook)
-								Image: framework.GetPauseImageNameForHostArch(),
+		})
-								Lifecycle: &v1.Lifecycle{
+		It("should execute prestop exec hook properly [Conformance]", func() {
+			lifecycle := &v1.Lifecycle{
+				PreStop: &v1.Handler{
+					Exec: &v1.ExecAction{
+						Command: []string{"sh", "-c", "curl http://" + targetIP + ":8080/echo?msg=prestop"},
+					},
+				},
+			}
+			podWithHook := getPodWithHook("pod-with-prestop-exec-hook", "gcr.io/google_containers/hostexec:1.2", lifecycle)
+			testPodWithHook(podWithHook)
+		})
+		It("should execute poststart http hook properly [Conformance]", func() {
+			lifecycle := &v1.Lifecycle{
 				PostStart: &v1.Handler{
 					HTTPGet: &v1.HTTPGetAction{
 						Path: "/echo?msg=poststart",
@@ -171,24 +114,12 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 						Port: intstr.FromInt(8080),
 					},
 				},
-								},
-							},
-						},
-					},
 			}
-				testPodWithHttpHook(podWithHook)
+			podWithHook := getPodWithHook("pod-with-poststart-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle)
+			testPodWithHook(podWithHook)
 		})
 		It("should execute prestop http hook properly [Conformance]", func() {
-				podWithHook := &v1.Pod{
+			lifecycle := &v1.Lifecycle{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "pod-with-prestop-http-hook",
-					},
-					Spec: v1.PodSpec{
-						Containers: []v1.Container{
-							{
-								Name:  "pod-with-prestop-http-hook",
-								Image: framework.GetPauseImageNameForHostArch(),
-								Lifecycle: &v1.Lifecycle{
 				PreStop: &v1.Handler{
 					HTTPGet: &v1.HTTPGetAction{
 						Path: "/echo?msg=prestop",
@@ -196,18 +127,14 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 						Port: intstr.FromInt(8080),
 					},
 				},
-								},
-							},
-						},
-					},
 			}
-				testPodWithHttpHook(podWithHook)
+			podWithHook := getPodWithHook("pod-with-prestop-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle)
-			})
+			testPodWithHook(podWithHook)
 		})
 	})
 })
 
-func getExecHookTestPod(name string, cmd []string) *v1.Pod {
+func getPodWithHook(name string, image string, lifecycle *v1.Lifecycle) *v1.Pod {
 	return &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
@@ -216,21 +143,8 @@ func getExecHookTestPod(name string, cmd []string) *v1.Pod {
 			Containers: []v1.Container{
 				{
 					Name:      name,
-					Image: "gcr.io/google_containers/busybox:1.24",
+					Image:     image,
-					VolumeMounts: []v1.VolumeMount{
+					Lifecycle: lifecycle,
-						{
-							Name:      "tmpfs",
-							MountPath: "/tmp",
-						},
-					},
-					Command: cmd,
-				},
-			},
-			RestartPolicy: v1.RestartPolicyNever,
-			Volumes: []v1.Volume{
-				{
-					Name:         "tmpfs",
-					VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp"}},
 				},
 			},
 		},