From b5a5dbeeda4bdbfa311323bdf3fddff34f34eb7f Mon Sep 17 00:00:00 2001
From: Neeraj Krishna Gopalakrishna <ngopalak@redhat.com>
Date: Tue, 23 Sep 2025 09:06:51 +0530
Subject: [PATCH 1/2] Disable Swap mode

---
 features/features.go                                        | 6 +++---
 .../featuregates/featureGate-Hypershift-Default.yaml        | 6 +++---
 .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml         | 6 +++---
 .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml        | 6 +++---
 .../featuregates/featureGate-SelfManagedHA-Default.yaml     | 6 +++---
 .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml      | 6 +++---
 .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml     | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/features/features.go b/features/features.go
index 34f4f0a706e..5e7511ff72c 100644
--- 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
index c6026cda089..e4504e6822b 100644
--- 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
index f0f524e0b6c..22196b89eab 100644
--- 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
index 2d81b0f2d9d..efee2920d7a 100644
--- 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
index 61081d796ae..47dce94f38f 100644
--- 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
index d1fe1831c1c..5a8ae057a2d 100644
--- 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
index cf578a66b9b..d1d50b332d9 100644
--- 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"
                     },

From cb33f9f688df42f4161fdec298231ff1118d1202 Mon Sep 17 00:00:00 2001
From: Neeraj Krishna Gopalakrishna <ngopalak@redhat.com>
Date: Wed, 24 Sep 2025 08:40:26 +0530
Subject: [PATCH 2/2] Remove NodeSwap Flag from OpenShift API

---
 features.md                                              | 1 -
 features/features.go                                     | 9 ---------
 .../render/renderassets/rendered_manifests_test.go       | 1 -
 .../featuregates/featureGate-Hypershift-Default.yaml     | 3 ---
 .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml      | 3 ---
 .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml     | 3 ---
 .../featuregates/featureGate-SelfManagedHA-Default.yaml  | 3 ---
 .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml   | 3 ---
 .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml  | 3 ---
 9 files changed, 29 deletions(-)

diff --git a/features.md b/features.md
index dc792f76baf..5abca789365 100644
--- a/features.md
+++ b/features.md
@@ -59,7 +59,6 @@
 | MixedCPUsAllocation| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MultiDiskSetup| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MutatingAdmissionPolicy| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| NodeSwap| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | NutanixMultiSubnets| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OVNObservability| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | PreconfiguredUDNAddresses| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
index 5e7511ff72c..46d7179404d 100644
--- a/features/features.go
+++ b/features/features.go
@@ -92,15 +92,6 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	// 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.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
 
 	FeatureGateDynamicResourceAllocation = newFeatureGate("DynamicResourceAllocation").
 						reportProblemsToJiraComponent("scheduling").
diff --git a/payload-command/render/renderassets/rendered_manifests_test.go b/payload-command/render/renderassets/rendered_manifests_test.go
index 3ca8b68f7cd..834f82c50ea 100644
--- a/payload-command/render/renderassets/rendered_manifests_test.go
+++ b/payload-command/render/renderassets/rendered_manifests_test.go
@@ -104,7 +104,6 @@ status:
     - name: MachineConfigNodes
     - name: MaxUnavailableStatefulSet
     - name: MetricsServer
-    - name: NodeSwap
     - name: RouteExternalCertificate
     - name: SigstoreImageVerification
     - name: ValidatingAdmissionPolicy
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index e4504e6822b..0b322549491 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -332,9 +332,6 @@
                     },
                     {
                         "name": "VSphereMultiNetworks"
-                    },
-                    {
-                        "name": "NodeSwap"
                     }
                 ],
                 "version": ""
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 22196b89eab..8245bfc8e3a 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -65,9 +65,6 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index efee2920d7a..fad56abd0aa 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -80,9 +80,6 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 47dce94f38f..db9eb4b4e8e 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -332,9 +332,6 @@
                     },
                     {
                         "name": "VSphereMultiNetworks"
-                    },
-                    {
-                        "name": "NodeSwap"
                     }
                 ],
                 "version": ""
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 5a8ae057a2d..004214a1272 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -47,9 +47,6 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index d1d50b332d9..eca53a933f8 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -62,9 +62,6 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },