Merge pull request #6731 from xiang90/util-kubulet

pkg/kubelet: kill a TODO in util.go

cmd/kubelet/app/server.go

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

pkg/capabilities/capabilities.go

@@ -40,6 +40,14 @@ func Initialize(c Capabilities) {
 	})
 }
 
+// Setup the capability set.  It wraps Initialize for improving usibility.
+func Setup(allowPrivileged bool, hostNetworkSources []string) {
+	Initialize(Capabilities{
+		AllowPrivileged:    allowPrivileged,
+		HostNetworkSources: hostNetworkSources,
+	})
+}
+
 // SetCapabilitiesForTests.  Convenience method for testing.  This should only be called from tests.
 func SetForTests(c Capabilities) {
 	capabilities = &c

pkg/kubelet/util.go

@@ -19,18 +19,9 @@ package kubelet
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
 	cadvisorApi "github.com/google/cadvisor/info/v1"
 )
 
-// TODO: move this into pkg/capabilities
-func SetupCapabilities(allowPrivileged bool, hostNetworkSources []string) {
-	capabilities.Initialize(capabilities.Capabilities{
-		AllowPrivileged:    allowPrivileged,
-		HostNetworkSources: hostNetworkSources,
-	})
-}
-
 func CapacityFromMachineInfo(info *cadvisorApi.MachineInfo) api.ResourceList {
 	c := api.ResourceList{
 		api.ResourceCPU: *resource.NewMilliQuantity(