mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #36810 from gmarek/secrets
Automatic merge from submit-queue Add ServiceAccounts to kubemark cc @yujuhong
This commit is contained in:
commit
28d273c8b2
@ -40,6 +40,7 @@ go_library(
|
|||||||
"//pkg/util/mount:go_default_library",
|
"//pkg/util/mount:go_default_library",
|
||||||
"//pkg/util/oom:go_default_library",
|
"//pkg/util/oom:go_default_library",
|
||||||
"//pkg/volume/empty_dir:go_default_library",
|
"//pkg/volume/empty_dir:go_default_library",
|
||||||
|
"//pkg/volume/secret:go_default_library",
|
||||||
"//test/utils:go_default_library",
|
"//test/utils:go_default_library",
|
||||||
"//vendor:github.com/golang/glog",
|
"//vendor:github.com/golang/glog",
|
||||||
],
|
],
|
||||||
|
@ -34,6 +34,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/util/mount"
|
"k8s.io/kubernetes/pkg/util/mount"
|
||||||
"k8s.io/kubernetes/pkg/util/oom"
|
"k8s.io/kubernetes/pkg/util/oom"
|
||||||
"k8s.io/kubernetes/pkg/volume/empty_dir"
|
"k8s.io/kubernetes/pkg/volume/empty_dir"
|
||||||
|
"k8s.io/kubernetes/pkg/volume/secret"
|
||||||
"k8s.io/kubernetes/test/utils"
|
"k8s.io/kubernetes/test/utils"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
@ -61,6 +62,8 @@ func NewHollowKubelet(
|
|||||||
// -----------------
|
// -----------------
|
||||||
// Injected objects
|
// Injected objects
|
||||||
// -----------------
|
// -----------------
|
||||||
|
volumePlugins := empty_dir.ProbeVolumePlugins()
|
||||||
|
volumePlugins = append(volumePlugins, secret.ProbeVolumePlugins()...)
|
||||||
d := &kubelet.KubeletDeps{
|
d := &kubelet.KubeletDeps{
|
||||||
KubeClient: client,
|
KubeClient: client,
|
||||||
DockerClient: dockerClient,
|
DockerClient: dockerClient,
|
||||||
@ -68,7 +71,7 @@ func NewHollowKubelet(
|
|||||||
Cloud: nil,
|
Cloud: nil,
|
||||||
OSInterface: &containertest.FakeOS{},
|
OSInterface: &containertest.FakeOS{},
|
||||||
ContainerManager: containerManager,
|
ContainerManager: containerManager,
|
||||||
VolumePlugins: empty_dir.ProbeVolumePlugins(),
|
VolumePlugins: volumePlugins,
|
||||||
TLSOptions: nil,
|
TLSOptions: nil,
|
||||||
OOMAdjuster: oom.NewFakeOOMAdjuster(),
|
OOMAdjuster: oom.NewFakeOOMAdjuster(),
|
||||||
Writer: &kubeio.StdWriter{},
|
Writer: &kubeio.StdWriter{},
|
||||||
|
@ -81,6 +81,9 @@
|
|||||||
"cpu": "50m",
|
"cpu": "50m",
|
||||||
"memory": "100M"
|
"memory": "100M"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"securityContext": {
|
||||||
|
"privileged": true
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
@ -122,6 +122,7 @@ kubernetes/server/bin/kube-apiserver \
|
|||||||
--secure-port=443 \
|
--secure-port=443 \
|
||||||
--basic-auth-file=/srv/kubernetes/basic_auth.csv \
|
--basic-auth-file=/srv/kubernetes/basic_auth.csv \
|
||||||
--target-ram-mb=$((${NUM_NODES} * 60)) \
|
--target-ram-mb=$((${NUM_NODES} * 60)) \
|
||||||
|
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota \
|
||||||
$(cat apiserver_flags) &> /var/log/kube-apiserver.log &
|
$(cat apiserver_flags) &> /var/log/kube-apiserver.log &
|
||||||
|
|
||||||
# kube-contoller-manager now needs running kube-api server to actually start
|
# kube-contoller-manager now needs running kube-api server to actually start
|
||||||
|
Loading…
Reference in New Issue
Block a user