Bump cAdvisor to v0.43.0

Bumping cAdvisor from v0.39.2 -> v0.43.0

* Also pin transitive dependencies
  * containerd v1.4.9 -> v1.4.11
  * docker v20.10.2+incompatible> v20.10.7+incompatible

Signed-off-by: David Porter <david@porter.me>

vendor/github.com/google/cadvisor/utils/cloudinfo/cloudinfo.go

@@ -17,8 +17,9 @@
 package cloudinfo
 
 import (
-	info "github.com/google/cadvisor/info/v1"
 	"k8s.io/klog/v2"
+
+	info "github.com/google/cadvisor/info/v1"
 )
 
 type CloudInfo interface {

vendor/github.com/google/cadvisor/utils/cpuload/cpuload.go

@@ -19,8 +19,9 @@ import (
 
 	info "github.com/google/cadvisor/info/v1"
 
-	"github.com/google/cadvisor/utils/cpuload/netlink"
 	"k8s.io/klog/v2"
+
+	"github.com/google/cadvisor/utils/cpuload/netlink"
 )
 
 type CpuLoadReader interface {

vendor/github.com/google/cadvisor/utils/cpuload/netlink/netlink.go

@@ -21,8 +21,9 @@ import (
 	"os"
 	"syscall"
 
-	info "github.com/google/cadvisor/info/v1"
 	"golang.org/x/sys/unix"
+
+	info "github.com/google/cadvisor/info/v1"
 )
 
 var (

vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go

@@ -64,6 +64,8 @@ var (
 )
 
 type CacheInfo struct {
+	// cache id
+	Id int
 	// size in bytes
 	Size uint64
 	// cache type - instruction, data, unified
@@ -292,14 +294,24 @@ func getCPUCount(cache string) (count int, err error) {
 	return
 }
 
-func (fs *realSysFs) GetCacheInfo(id int, name string) (CacheInfo, error) {
-	cachePath := fmt.Sprintf("%s%d/cache/%s", cacheDir, id, name)
-	out, err := ioutil.ReadFile(path.Join(cachePath, "/size"))
+func (fs *realSysFs) GetCacheInfo(cpu int, name string) (CacheInfo, error) {
+	cachePath := fmt.Sprintf("%s%d/cache/%s", cacheDir, cpu, name)
+	out, err := ioutil.ReadFile(path.Join(cachePath, "/id"))
+	if err != nil {
+		return CacheInfo{}, err
+	}
+	var id int
+	n, err := fmt.Sscanf(string(out), "%d", &id)
+	if err != nil || n != 1 {
+		return CacheInfo{}, err
+	}
+
+	out, err = ioutil.ReadFile(path.Join(cachePath, "/size"))
 	if err != nil {
 		return CacheInfo{}, err
 	}
 	var size uint64
-	n, err := fmt.Sscanf(string(out), "%dK", &size)
+	n, err = fmt.Sscanf(string(out), "%dK", &size)
 	if err != nil || n != 1 {
 		return CacheInfo{}, err
 	}
@@ -325,6 +337,7 @@ func (fs *realSysFs) GetCacheInfo(id int, name string) (CacheInfo, error) {
 		return CacheInfo{}, err
 	}
 	return CacheInfo{
+		Id:    id,
 		Size:  size,
 		Level: level,
 		Type:  cacheType,

vendor/github.com/google/cadvisor/utils/sysfs/sysfs_notx86.go

@@ -1,3 +1,4 @@
+//go:build !x86
 // +build !x86
 
 // Copyright 2021 Google Inc. All Rights Reserved.

vendor/github.com/google/cadvisor/utils/sysfs/sysfs_x86.go

@@ -1,3 +1,4 @@
+//go:build x86
 // +build x86
 
 // Copyright 2021 Google Inc. All Rights Reserved.

vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go

@@ -332,20 +332,34 @@ func addCacheInfo(sysFs sysfs.SysFs, node *info.Node) error {
 
 		for _, cache := range caches {
 			c := info.Cache{
+				Id:    cache.Id,
 				Size:  cache.Size,
 				Level: cache.Level,
 				Type:  cache.Type,
 			}
-			if cache.Cpus == numThreadsPerNode && cache.Level > cacheLevel2 {
-				// Add a node-level cache.
-				cacheFound := false
-				for _, nodeCache := range node.Caches {
-					if nodeCache == c {
-						cacheFound = true
+			if cache.Level > cacheLevel2 {
+				if cache.Cpus == numThreadsPerNode {
+					// Add a node level cache.
+					cacheFound := false
+					for _, nodeCache := range node.Caches {
+						if nodeCache == c {
+							cacheFound = true
+						}
+					}
+					if !cacheFound {
+						node.Caches = append(node.Caches, c)
+					}
+				} else {
+					// Add uncore cache, for architecture in which l3 cache only shared among some cores.
+					uncoreCacheFound := false
+					for _, uncoreCache := range node.Cores[coreID].UncoreCaches {
+						if uncoreCache == c {
+							uncoreCacheFound = true
+						}
+					}
+					if !uncoreCacheFound {
+						node.Cores[coreID].UncoreCaches = append(node.Cores[coreID].UncoreCaches, c)
 					}
-				}
-				if !cacheFound {
-					node.Caches = append(node.Caches, c)
 				}
 			} else if cache.Cpus == numThreadsPerCore {
 				// Add core level cache