Merge pull request #69313 from sjenning/crio-socket-update

kubelet: fix cri-o when using unix prefix

Merge pull request #69313 from sjenning/crio-socket-update
ede43880 · k8s-ci-robot · GitHub · dc239741 · 7a12ac10 · ede43880
Unverified Commit ede43880 authored Oct 31, 2018 by k8s-ci-robot Committed by GitHub Oct 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go pkg/kubelet/cadvisor/util.go +1 -1

No files found.
--- a/pkg/kubelet/cadvisor/util.go
+++ b/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
 }