Remove NodeSwap Flag from OpenShift API

ngopalak-redhat · ngopalak-redhat · commit cb33f9f688df · 2025-09-24T08:40:26.000+05:30
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -62,9 +62,6 @@
                     {
                         "name": "AWSServiceLBNetworkSecurityGroup"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "AdditionalRoutingCapabilities"
                     },

Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,6 @@`
`332`	`332`	`},`
`333`	`333`	`{`
`334`	`334`	`"name": "VSphereMultiNetworks"`
`335`		`- },`
`336`		`- {`
`337`		`- "name": "NodeSwap"`
`338`	`335`	`}`
`339`	`336`	`],`
`340`	`337`	`"version": ""`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,6 @@`
`65`	`65`	`{`
`66`	`66`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`67`	`67`	`},`
`68`		`- {`
`69`		`- "name": "NodeSwap"`
`70`		`- },`
`71`	`68`	`{`
`72`	`69`	`"name": "AdditionalRoutingCapabilities"`
`73`	`70`	`},`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,6 @@`
`80`	`80`	`{`
`81`	`81`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`82`	`82`	`},`
`83`		`- {`
`84`		`- "name": "NodeSwap"`
`85`		`- },`
`86`	`83`	`{`
`87`	`84`	`"name": "AdditionalRoutingCapabilities"`
`88`	`85`	`},`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@`
`47`	`47`	`{`
`48`	`48`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`49`	`49`	`},`
`50`		`- {`
`51`		`- "name": "NodeSwap"`
`52`		`- },`
`53`	`50`	`{`
`54`	`51`	`"name": "AdditionalRoutingCapabilities"`
`55`	`52`	`},`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,6 @@`
`62`	`62`	`{`
`63`	`63`	`"name": "AWSServiceLBNetworkSecurityGroup"`
`64`	`64`	`},`
`65`		`- {`
`66`		`- "name": "NodeSwap"`
`67`		`- },`
`68`	`65`	`{`
`69`	`66`	`"name": "AdditionalRoutingCapabilities"`
`70`	`67`	`},`