Merge pull request #2494 from ngopalak-redhat/ngopalak/remove_node_swap

openshift-merge-bot[bot] · web-flow · commit 7f245291a17a · 2025-09-30T13:45:00.000Z
OCPBUGS-62068: NodeSwap Feature Gate usage to be removed
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()
 
-	// OpenShift and Node Team will keep this turned off until evictions and
-	// disk provisioning are fixed even though upstream will take this GA.
-	FeatureGateNodeSwap = newFeatureGate("NodeSwap").
-				reportProblemsToJiraComponent("node").
-				contactPerson("haircommander").
-				productScope(kubernetes).
-				enhancementPR("https://github.com/kubernetes/enhancements/issues/2400").
-				enableIn(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
@@ -184,9 +184,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -257,9 +257,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
@@ -260,9 +260,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"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -257,9 +257,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
@@ -260,9 +260,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`	`},`
Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,6 @@`
`257`	`257`	`{`
`258`	`258`	`"name": "NetworkSegmentation"`
`259`	`259`	`},`
`260`		`- {`
`261`		`- "name": "NodeSwap"`
`262`		`- },`
`263`	`260`	`{`
`264`	`261`	`"name": "NutanixMultiSubnets"`
`265`	`262`	`},`
Original file line number	Diff line number	Diff line change
`@@ -260,9 +260,6 @@`
`260`	`260`	`{`
`261`	`261`	`"name": "NetworkSegmentation"`
`262`	`262`	`},`
`263`		`- {`
`264`		`- "name": "NodeSwap"`
`265`		`- },`
`266`	`263`	`{`
`267`	`264`	`"name": "NutanixMultiSubnets"`
`268`	`265`	`},`