Add ServiceAccounts to Kubemark

pull/6/head
gmarek 2016-11-15 15:01:14 +01:00
parent 05d067d6bb
commit 7439a956ef
4 changed files with 9 additions and 1 deletions

View File

@ -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",
],

View File

@ -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{},

View File

@ -81,6 +81,9 @@
"cpu": "50m",
"memory": "100M"
}
},
"securityContext": {
"privileged": true
}
},

View File

@ -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