From 7b4311e51802483ad70198b6cea3b9601d142105 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 11 Dec 2017 15:37:12 -0500 Subject: [PATCH] kubelet should use the value of the cri container runtime endpoint from cadvisor --- pkg/kubelet/cadvisor/helpers_linux.go | 2 +- pkg/kubelet/cadvisor/util.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cadvisor/helpers_linux.go b/pkg/kubelet/cadvisor/helpers_linux.go index ea10588c8c7..10b5e05a008 100644 --- a/pkg/kubelet/cadvisor/helpers_linux.go +++ b/pkg/kubelet/cadvisor/helpers_linux.go @@ -43,7 +43,7 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) { // This is a temporary workaround to get stats for cri-o from cadvisor // and should be removed. // Related to https://github.com/kubernetes/kubernetes/issues/51798 - if i.runtimeEndpoint == "/var/run/crio.sock" { + if i.runtimeEndpoint == CrioSocket { return cadvisorfs.LabelCrioImages, nil } } diff --git a/pkg/kubelet/cadvisor/util.go b/pkg/kubelet/cadvisor/util.go index 7937917a89b..e4107d5b4a7 100644 --- a/pkg/kubelet/cadvisor/util.go +++ b/pkg/kubelet/cadvisor/util.go @@ -29,6 +29,12 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" ) +const ( + // Please keep this in sync with the one in: + // github.com/google/cadvisor/container/crio/client.go + CrioSocket = "/var/run/crio/crio.sock" +) + func CapacityFromMachineInfo(info *cadvisorapi.MachineInfo) v1.ResourceList { c := v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity( @@ -71,5 +77,5 @@ func EphemeralStorageCapacityFromFsInfo(info cadvisorapi2.FsInfo) v1.ResourceLis func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool { return runtime == kubetypes.RktContainerRuntime || (runtime == kubetypes.DockerContainerRuntime && goruntime.GOOS == "linux") || - runtimeEndpoint == "/var/run/crio.sock" + runtimeEndpoint == CrioSocket }