Inline some SecurityContext fields into PodSecurityContext

test/e2e/security_context.go

@@ -23,13 +23,15 @@ limitations under the License.
 package e2e
 
 import (
+	"fmt"
+
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/util"
 
 	. "github.com/onsi/ginkgo"
 )
 
-func getSecurityContextTestPod() *api.Pod {
+func scTestPod() *api.Pod {
 	podName := "security-context-" + string(util.NewUUID())
 	pod := &api.Pod{
 		ObjectMeta: api.ObjectMeta{
@@ -55,11 +57,35 @@ var _ = Describe("[Skipped] Security Context", func() {
 	framework := NewFramework("security-context")
 
 	It("should support pod.Spec.SecurityContext.SupplementalGroups", func() {
-		pod := getSecurityContextTestPod()
+		pod := scTestPod()
 		pod.Spec.Containers[0].Command = []string{"id", "-G"}
 		pod.Spec.SecurityContext.SupplementalGroups = []int64{1234, 5678}
 		groups := []string{"1234", "5678"}
 		framework.TestContainerOutput("pod.Spec.SecurityContext.SupplementalGroups", pod, 0, groups)
 	})
 
+	It("should support pod.Spec.SecurityContext.RunAsUser", func() {
+		pod := scTestPod()
+		var uid int64 = 1001
+		pod.Spec.SecurityContext.RunAsUser = &uid
+		pod.Spec.Containers[0].Command = []string{"sh", "-c", "id -u"}
+
+		framework.TestContainerOutput("pod.Spec.SecurityContext.RunAsUser", pod, 0, []string{
+			fmt.Sprintf("%v", uid),
+		})
+	})
+
+	It("should support container.SecurityContext.RunAsUser", func() {
+		pod := scTestPod()
+		var uid int64 = 1001
+		var overrideUid int64 = 1002
+		pod.Spec.SecurityContext.RunAsUser = &uid
+		pod.Spec.Containers[0].SecurityContext = new(api.SecurityContext)
+		pod.Spec.Containers[0].SecurityContext.RunAsUser = &overrideUid
+		pod.Spec.Containers[0].Command = []string{"sh", "-c", "id -u"}
+
+		framework.TestContainerOutput("pod.Spec.SecurityContext.RunAsUser", pod, 0, []string{
+			fmt.Sprintf("%v", overrideUid),
+		})
+	})
 })