github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Del capatical local packagename for cadvisorApi

Browse Source
This commit is contained in:
eulerzgy
2015-10-16 11:00:28 +08:00
parent 282b5abfef
commit 31c09bdcb8
22 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/util.go
View File

@@ -19,7 +19,7 @@ package kubelet
import (
"fmt"
cadvisorApi "github.com/google/cadvisor/info/v1"
cadvisorapi "github.com/google/cadvisor/info/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/capabilities"
@@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/securitycontext"
)
func CapacityFromMachineInfo(info *cadvisorApi.MachineInfo) api.ResourceList {
func CapacityFromMachineInfo(info *cadvisorapi.MachineInfo) api.ResourceList {
c := api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(
int64(info.NumCores*1000),