mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #69313 from sjenning/crio-socket-update
kubelet: fix cri-o when using unix prefix
This commit is contained in:
commit
ede4388000
@ -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
|
// UsingLegacyCadvisorStats returns true if container stats are provided by cadvisor instead of through the CRI
|
||||||
func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool {
|
func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool {
|
||||||
return (runtime == kubetypes.DockerContainerRuntime && goruntime.GOOS == "linux") ||
|
return (runtime == kubetypes.DockerContainerRuntime && goruntime.GOOS == "linux") ||
|
||||||
runtimeEndpoint == CrioSocket
|
runtimeEndpoint == CrioSocket || runtimeEndpoint == "unix://"+CrioSocket
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user