github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

pkg/kubelet: kill a TODO in util.go

Browse Source 
Move kubelet.CapabilitiesSetup to capabilities.Setup
This commit is contained in:
Xiang Li
2015-04-11 10:55:31 -07:00
parent d577db9987
commit cea38a2f4e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/app/server.go
View File

@@ -29,6 +29,7 @@ import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth"
@@ -406,7 +407,7 @@ func RunKubelet(kcfg *KubeletConfig, builder KubeletBuilder) {
} else {
glog.Infof("No api server defined - no events will be sent to API server.")
}
kubelet.SetupCapabilities(kcfg.AllowPrivileged, kcfg.HostNetworkSources)
capabilities.Setup(kcfg.AllowPrivileged, kcfg.HostNetworkSources)
credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory)