From 5fe1f1775e7779f8c03f57356f784e5333b46d1d Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 31 Oct 2018 11:49:58 -0500 Subject: [PATCH] UPSTREAM: 69313: kubelet: fix cri-o when using unix prefix --- vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go index 16596daa9d9a..9a7e8746436b 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go @@ -76,5 +76,5 @@ func EphemeralStorageCapacityFromFsInfo(info cadvisorapi2.FsInfo) v1.ResourceLis // UsingLegacyCadvisorStats returns true if container stats are provided by cadvisor instead of through the CRI func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool { return (runtime == kubetypes.DockerContainerRuntime && goruntime.GOOS == "linux") || - runtimeEndpoint == CrioSocket + runtimeEndpoint == CrioSocket || runtimeEndpoint == "unix://"+CrioSocket }