github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130569 from dims/update-to-latest-cadvisor-v0.52.0

Browse Source 
Update to latest cadvisor @ v0.52.1 and new opencontainer/cgroups and drops opencontainers/runc
This commit is contained in:
Kubernetes Prow Robot
2025-03-07 17:09:51 -08:00
committed by GitHub
parent 1d88598555 97a54dc4b0
commit 0eaee48ecb
363 changed files with 13665 additions and 6536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/oomkiller_linux_test.go
View File

@@ -31,7 +31,7 @@ import (
admissionapi "k8s.io/pod-security-admission/api"
"github.com/onsi/ginkgo/v2"
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
libcontainercgroups "github.com/opencontainers/cgroups"
"k8s.io/utils/ptr"
)

2
test/e2e_node/resource_collector.go
View File

@@ -32,7 +32,7 @@ import (
cadvisorclient "github.com/google/cadvisor/client/v2"
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/cgroups"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"

2
test/e2e_node/utils_linux.go
View File

@@ -22,7 +22,7 @@ package e2enode
import (
"fmt"
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
libcontainercgroups "github.com/opencontainers/cgroups"
"k8s.io/kubernetes/test/e2e_node/criproxy"
)