Bugfix: cAdvisor machine info Clone() - clone SwapCapacity

PR for the fix at upstream cAdvisor: google/cadvisor#3293 Signed-off-by: Itamar Holder <[email protected]>
iholder101 · Apr 16, 2023 · 46b0dfb · 46b0dfb
1 parent 4880d78
commit 46b0dfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_linux.go b/pkg/kubelet/kuberuntime/kuberuntime_container_linux.go
@@ -343,6 +343,7 @@ func (m swapConfigurationHelper) configureLimitedSwap(lcr *runtimeapi.LinuxConta
 }
 
 func (m swapConfigurationHelper) configureUnlimitedSwap(lcr *runtimeapi.LinuxContainerResources) {
+	klog.Infof("configuring unlimited swap")
 	if m.isCgroup2UnifiedMode {
 		lcr.Unified[cm.Cgroup2MaxSwapFilename] = "max"
 	} else {
@@ -351,6 +352,7 @@ func (m swapConfigurationHelper) configureUnlimitedSwap(lcr *runtimeapi.LinuxCon
 }
 
 func (m swapConfigurationHelper) configureNoSwap(lcr *runtimeapi.LinuxContainerResources) {
+	klog.Infof("configuring no swap")
 	if m.isCgroup2UnifiedMode {
 		lcr.Unified[cm.Cgroup2MaxSwapFilename] = "0"
 	} else {

diff --git a/vendor/github.com/google/cadvisor/info/v1/machine.go b/vendor/github.com/google/cadvisor/info/v1/machine.go