From 7439a956efe56fb8bcc221d2a1dbe163eb40a404 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Tue, 15 Nov 2016 15:01:14 +0100
Subject: [PATCH] Add ServiceAccounts to Kubemark

---
 pkg/kubemark/BUILD                                | 1 +
 pkg/kubemark/hollow_kubelet.go                    | 5 ++++-
 test/kubemark/resources/hollow-node_template.json | 3 +++
 test/kubemark/start-kubemark-master.sh            | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD
index 225a3ad9556..feb67030c90 100644
--- a/pkg/kubemark/BUILD
+++ b/pkg/kubemark/BUILD
@@ -40,6 +40,7 @@ go_library(
         "//pkg/util/mount:go_default_library",
         "//pkg/util/oom:go_default_library",
         "//pkg/volume/empty_dir:go_default_library",
+        "//pkg/volume/secret:go_default_library",
         "//test/utils:go_default_library",
         "//vendor:github.com/golang/glog",
     ],
diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go
index 49433c747db..7847ad0488e 100644
--- a/pkg/kubemark/hollow_kubelet.go
+++ b/pkg/kubemark/hollow_kubelet.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/volume/empty_dir"
+	"k8s.io/kubernetes/pkg/volume/secret"
 	"k8s.io/kubernetes/test/utils"
 
 	"github.com/golang/glog"
@@ -61,6 +62,8 @@ func NewHollowKubelet(
 	// -----------------
 	// Injected objects
 	// -----------------
+	volumePlugins := empty_dir.ProbeVolumePlugins()
+	volumePlugins = append(volumePlugins, secret.ProbeVolumePlugins()...)
 	d := &kubelet.KubeletDeps{
 		KubeClient:        client,
 		DockerClient:      dockerClient,
@@ -68,7 +71,7 @@ func NewHollowKubelet(
 		Cloud:             nil,
 		OSInterface:       &containertest.FakeOS{},
 		ContainerManager:  containerManager,
-		VolumePlugins:     empty_dir.ProbeVolumePlugins(),
+		VolumePlugins:     volumePlugins,
 		TLSOptions:        nil,
 		OOMAdjuster:       oom.NewFakeOOMAdjuster(),
 		Writer:            &kubeio.StdWriter{},
diff --git a/test/kubemark/resources/hollow-node_template.json b/test/kubemark/resources/hollow-node_template.json
index a9c0c6433c0..5d0d16c5613 100644
--- a/test/kubemark/resources/hollow-node_template.json
+++ b/test/kubemark/resources/hollow-node_template.json
@@ -81,6 +81,9 @@
 							"cpu": "50m",
 							"memory": "100M"
 						}
+					},
+					"securityContext": {
+						"privileged": true
 					}
 
 				},
diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh
index d16087a425a..b04a87a5434 100644
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
@@ -122,6 +122,7 @@ kubernetes/server/bin/kube-apiserver \
 	--secure-port=443 \
 	--basic-auth-file=/srv/kubernetes/basic_auth.csv \
 	--target-ram-mb=$((${NUM_NODES} * 60)) \
+	--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota \
 	$(cat apiserver_flags) &> /var/log/kube-apiserver.log &
 
 # kube-contoller-manager now needs running kube-api server to actually start