scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 02:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128447 from bart0sh/PR164-migrate-cadvisor-to-contextual-logging

Browse Source 
kubelet: Migrate CAdvisor to contextual logging
This commit is contained in:
Kubernetes Prow Robot
2024-11-06 20:10:10 +00:00
committed by GitHub
parent 198ec57f86 e5cb071c2e
commit 0edef5aa91
15 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet_test.go
View File

@@ -60,7 +60,6 @@ import (
remote "k8s.io/cri-client/pkg"
fakeremote "k8s.io/cri-client/pkg/fake"
"k8s.io/klog/v2"
"k8s.io/klog/v2/ktesting"
"k8s.io/kubernetes/pkg/features"
kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config"
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
@@ -104,6 +103,7 @@ import (
"k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/pkg/volume/util/hostutil"
"k8s.io/kubernetes/pkg/volume/util/subpath"
"k8s.io/kubernetes/test/utils/ktesting"
"k8s.io/utils/clock"
testingclock "k8s.io/utils/clock/testing"
"k8s.io/utils/ptr"
@@ -3091,6 +3091,7 @@ func createRemoteRuntimeService(endpoint string, t *testing.T, tp oteltrace.Trac
}
func TestNewMainKubeletStandAlone(t *testing.T) {
tCtx := ktesting.Init(t)
tempDir, err := os.MkdirTemp("", "logs")
ContainerLogsDir = tempDir
assert.NoError(t, err)
@@ -3106,7 +3107,7 @@ func TestNewMainKubeletStandAlone(t *testing.T) {
tp := noopoteltrace.NewTracerProvider()
cadvisor := cadvisortest.NewMockInterface(t)
cadvisor.EXPECT().MachineInfo().Return(&cadvisorapi.MachineInfo{}, nil).Maybe()
cadvisor.EXPECT().ImagesFsInfo().Return(cadvisorapiv2.FsInfo{
cadvisor.EXPECT().ImagesFsInfo(tCtx).Return(cadvisorapiv2.FsInfo{
Usage: 400,
Capacity: 1000,
Available: 600,