Disable Swap mode

ngopalak-redhat · ngopalak-redhat · commit b5a5dbeeda4b · 2025-09-23T09:06:51.000+05:30
diff --git a/features/features.go b/features/features.go
@@ -92,14 +92,14 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	// OpenShift and Node Team will keep this turned off until evictions and
-	// disk provisioning are fixed even though upstream will take this GA.
+	// NodeSwap is now GA and locked to true in Kubernetes 1.34+
+	// Must be enabled to align with upstream Kubernetes behavior.
 	FeatureGateNodeSwap = newFeatureGate("NodeSwap").
 				reportProblemsToJiraComponent("node").
 				contactPerson("haircommander").
 				productScope(kubernetes).
 				enhancementPR("https://github.com/kubernetes/enhancements/issues/2400").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
 
 	FeatureGateDynamicResourceAllocation = newFeatureGate("DynamicResourceAllocation").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
@@ -335,6 +332,9 @@
                     },
                     {
                         "name": "VSphereMultiNetworks"
+                    },
+                    {
+                        "name": "NodeSwap"
                     }
                 ],
                 "version": ""
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -65,6 +65,9 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
+                    {
+                        "name": "NodeSwap"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
@@ -257,9 +260,6 @@
                     {
                         "name": "NetworkSegmentation"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -80,6 +80,9 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
+                    {
+                        "name": "NodeSwap"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
@@ -260,9 +263,6 @@
                     {
                         "name": "NetworkSegmentation"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
@@ -335,6 +332,9 @@
                     },
                     {
                         "name": "VSphereMultiNetworks"
+                    },
+                    {
+                        "name": "NodeSwap"
                     }
                 ],
                 "version": ""
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -47,6 +47,9 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
+                    {
+                        "name": "NodeSwap"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
@@ -257,9 +260,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -62,6 +62,9 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
+                    {
+                        "name": "NodeSwap"
+                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
@@ -260,9 +263,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },

Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,6 @@`
`184`	`184`	`{`
`185`	`185`	`"name": "NoRegistryClusterOperations"`
`186`	`186`	`},`
`187`		`- {`
`188`		`- "name": "NodeSwap"`
`189`		`- },`
`190`	`187`	`{`
`191`	`188`	`"name": "NutanixMultiSubnets"`
`192`	`189`	`},`
`@@ -335,6 +332,9 @@`
`335`	`332`	`},`
`336`	`333`	`{`
`337`	`334`	`"name": "VSphereMultiNetworks"`
	`335`	`+ },`
	`336`	`+ {`
	`337`	`+ "name": "NodeSwap"`
`338`	`338`	`}`
`339`	`339`	`],`
`340`	`340`	`"version": ""`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@`
`65`	`65`	`{`
`66`	`66`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`67`	`67`	`},`
	`68`	`+ {`
	`69`	`+ "name": "NodeSwap"`
	`70`	`+ },`
`68`	`71`	`{`
`69`	`72`	`"name": "AdditionalRoutingCapabilities"`
`70`	`73`	`},`
`@@ -257,9 +260,6 @@`
`257`	`260`	`{`
`258`	`261`	`"name": "NetworkSegmentation"`
`259`	`262`	`},`
`260`		`- {`
`261`		`- "name": "NodeSwap"`
`262`		`- },`
`263`	`263`	`{`
`264`	`264`	`"name": "NutanixMultiSubnets"`
`265`	`265`	`},`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@`
`80`	`80`	`{`
`81`	`81`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`82`	`82`	`},`
	`83`	`+ {`
	`84`	`+ "name": "NodeSwap"`
	`85`	`+ },`
`83`	`86`	`{`
`84`	`87`	`"name": "AdditionalRoutingCapabilities"`
`85`	`88`	`},`
`@@ -260,9 +263,6 @@`
`260`	`263`	`{`
`261`	`264`	`"name": "NetworkSegmentation"`
`262`	`265`	`},`
`263`		`- {`
`264`		`- "name": "NodeSwap"`
`265`		`- },`
`266`	`266`	`{`
`267`	`267`	`"name": "NutanixMultiSubnets"`
`268`	`268`	`},`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@`
`47`	`47`	`{`
`48`	`48`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`49`	`49`	`},`
	`50`	`+ {`
	`51`	`+ "name": "NodeSwap"`
	`52`	`+ },`
`50`	`53`	`{`
`51`	`54`	`"name": "AdditionalRoutingCapabilities"`
`52`	`55`	`},`
`@@ -257,9 +260,6 @@`
`257`	`260`	`{`
`258`	`261`	`"name": "NoRegistryClusterOperations"`
`259`	`262`	`},`
`260`		`- {`
`261`		`- "name": "NodeSwap"`
`262`		`- },`
`263`	`263`	`{`
`264`	`264`	`"name": "NutanixMultiSubnets"`
`265`	`265`	`},`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@`
`62`	`62`	`{`
`63`	`63`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`64`	`64`	`},`
	`65`	`+ {`
	`66`	`+ "name": "NodeSwap"`
	`67`	`+ },`
`65`	`68`	`{`
`66`	`69`	`"name": "AdditionalRoutingCapabilities"`
`67`	`70`	`},`
`@@ -260,9 +263,6 @@`
`260`	`263`	`{`
`261`	`264`	`"name": "NoRegistryClusterOperations"`
`262`	`265`	`},`
`263`		`- {`
`264`		`- "name": "NodeSwap"`
`265`		`- },`
`266`	`266`	`{`
`267`	`267`	`"name": "NutanixMultiSubnets"`
`268`	`268`	`},`