populate the new node.status.nodeInfo.swapInfo field

iholder101 · iholder101 · commit 16871a1faa02 · 2025-03-16T11:59:29.000+02:00
Signed-off-by: Itamar Holder &lt;iholder@redhat.com&gt;
diff --git a/pkg/kubelet/nodestatus/setters.go b/pkg/kubelet/nodestatus/setters.go
@@ -44,6 +44,7 @@ import (
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/events"
 	netutils "k8s.io/utils/net"
+	"k8s.io/utils/ptr"
 
 	"k8s.io/klog/v2"
 )
@@ -354,6 +355,12 @@ func MachineInfo(nodeName string,
 				// node status.
 				node.Status.Capacity[v1.ResourceName(removedResource)] = *resource.NewQuantity(int64(0), resource.DecimalSI)
 			}
+
+			if utilfeature.DefaultFeatureGate.Enabled(features.NodeSwap) && info.SwapCapacity != 0 {
+				node.Status.NodeInfo.Swap = &v1.NodeSwapStatus{
+					Capacity: ptr.To(int64(info.SwapCapacity)),
+				}
+			}
 		}
 
 		// Set Allocatable.

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ import (`
`44`	`44`	`kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"`
`45`	`45`	`"k8s.io/kubernetes/pkg/kubelet/events"`
`46`	`46`	`netutils "k8s.io/utils/net"`
	`47`	`+ "k8s.io/utils/ptr"`
`47`	`48`
`48`	`49`	`"k8s.io/klog/v2"`
`49`	`50`	`)`
`@@ -354,6 +355,12 @@ func MachineInfo(nodeName string,`
`354`	`355`	`// node status.`
`355`	`356`	`node.Status.Capacity[v1.ResourceName(removedResource)] = *resource.NewQuantity(int64(0), resource.DecimalSI)`
`356`	`357`	`}`
	`358`	`+`
	`359`	`+ if utilfeature.DefaultFeatureGate.Enabled(features.NodeSwap) && info.SwapCapacity != 0 {`
	`360`	`+ node.Status.NodeInfo.Swap = &v1.NodeSwapStatus{`
	`361`	`+ Capacity: ptr.To(int64(info.SwapCapacity)),`
	`362`	`+ }`
	`363`	`+ }`
`357`	`364`	`}`
`358`	`365`
`359`	`366`	`// Set Allocatable.`