OCPBUGS-62068: NodeSwap Feature Gate usage to be removed #2494

ngopalak-redhat · 2025-09-23T03:37:31Z

Setting the NodeSwap feature gate to false blocks the use of memorySwap -> swapDesired option in the KubeletConfig. With 1.34 the NodeSwap feature gate is always set to true. Hence this PR sets the NodeSwap feature gate to true for all the types of clusters.

Tested by removing the Flag completely:

Worker nodes:
  - failSwapOn: false
  - swapBehavior: NoSwap

  Control plane nodes:
  - failSwapOn: true
  - swapBehavior: NoSwap

The cluster was created with:

launch 4.21,openshift/machine-config-operator#5294,openshift/api#2494 gcp

This PR needs to be merged before openshift/machine-config-operator#5294.

This PR is tested along with openshift/machine-config-operator#5294
Fixes: https://issues.redhat.com/browse/OCPBUGS-62068

Installer using NodeSwap Feature Gate: https://github.com/openshift/installer/blob/main/pkg/types/defaults/validation/featuregates.go#L39

Since the default from upstream will be used it won't be impacted.
Also swapBehavior is controls the use of swap

openshift-ci · 2025-09-23T03:37:35Z

Hello @ngopalak-redhat! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

openshift-ci · 2025-09-23T03:37:36Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci-robot · 2025-09-23T14:39:32Z

@ngopalak-redhat: This pull request references Jira Issue OCPBUGS-62068, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Setting the NodeSwap feature gate to false blocks the use of memorySwap -> swapDesired option in the KubeletConfig. With 1.34 the NodeSwap feature gate is always set to true. Hence this PR sets the NodeSwap feature gate to true for all the types of clusters.

This PR is tested along with openshift/machine-config-operator#5294

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-09-23T14:39:48Z

@ngopalak-redhat: This pull request references Jira Issue OCPBUGS-62068, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

In response to this:

Setting the NodeSwap feature gate to false blocks the use of memorySwap -> swapDesired option in the KubeletConfig. With 1.34 the NodeSwap feature gate is always set to true. Hence this PR sets the NodeSwap feature gate to true for all the types of clusters.

This PR is tested along with openshift/machine-config-operator#5294
Fixes: https://issues.redhat.com/browse/OCPBUGS-62068

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

haircommander · 2025-09-23T14:49:04Z

features/features.go

+	// NodeSwap is now GA and locked to true in Kubernetes 1.34+
+	// Must be enabled to align with upstream Kubernetes behavior.


I don't think this comment is necessary anymore

haircommander · 2025-09-23T14:49:43Z

features/features.go

 	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).


@JoelSpeed do we still need to keep this standza if we're just going to follow a GA feature upstream? as in: should we even have this in the feature gates openshift is aware of anymore?

You have a choice. You can enable it in default now (1.33), or leave it to the promotion.

If you leave it to the promotion, you need to remove the gate now so that we fall back to the built-in behaviour, rather than being dictated by the feature gate opinions here.

What is the default upstream feature state in 1.33?

NodeSwap is true from 1.30 onwards in Upstream https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/

Do we have any testing to show what this feature is doing when it is enabled? Any E2E? Looks like nothing is showing up in sippy tagged by this gate, but perhaps there's some upstream tests?

I think we only want it in 1.34/4.21 and onward, and I'm inclined to just leave it to promotion as it's not only on by default but GA (and there's another toggle in the kubelet config to actually use it)

we won't have any e2e testing it downstream I believe because we're only using it (kubeletconfig swapMode: limitedSwap) in CNV environments, otherwise we'll block users from setting it (see openshift/machine-config-operator#5294)

@JoelSpeed @haircommander Here's are the steps as I understand for the removal of the NodeSwap gate:

Ensure the NodeSwap gate is not used anywhere in openshift code and docs. All the references from this search https://github.com/search?q=org%3Aopenshift%20NodeSwap&type=code have to be addressed for removal.

Remove it from the NodeSwap gate in this repo after all the references are removed.
This will allow the promotion to happen when 1.34 merges into openshift. Right?

I have removed the Flag and tested. Results are good and updated in the description

JoelSpeed · 2025-09-23T15:06:58Z

/test verify-feature-promotion

ngopalak-redhat · 2025-09-24T03:11:24Z

/test verify-feature-promotion

JoelSpeed · 2025-09-24T09:25:14Z

/lgtm

Assuming CI works, this should be good

openshift-ci-robot · 2025-09-24T09:43:12Z

@ngopalak-redhat: This pull request references Jira Issue OCPBUGS-62068, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

ngopalak-redhat · 2025-09-24T13:07:01Z

/test remaining-required

openshift-ci · 2025-09-24T13:07:43Z

@ngopalak-redhat: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build

/test e2e-aws-ovn

/test e2e-aws-ovn-hypershift

/test e2e-aws-ovn-hypershift-conformance

/test e2e-aws-ovn-techpreview

/test e2e-aws-serial-1of2

/test e2e-aws-serial-2of2

/test e2e-aws-serial-techpreview-1of2

/test e2e-aws-serial-techpreview-2of2

/test e2e-azure

/test e2e-gcp

/test e2e-upgrade

/test e2e-upgrade-out-of-change

/test images

/test integration

/test lint

/test minor-e2e-upgrade-minor

/test minor-images

/test okd-scos-images

/test unit

/test verify

/test verify-client-go

/test verify-crd-schema

/test verify-crdify

/test verify-deps

/test verify-feature-promotion

The following commands are available to trigger optional jobs:

/test okd-scos-e2e-aws-ovn

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-api-master-build

pull-ci-openshift-api-master-images

pull-ci-openshift-api-master-integration

pull-ci-openshift-api-master-lint

pull-ci-openshift-api-master-minor-e2e-upgrade-minor

pull-ci-openshift-api-master-minor-images

pull-ci-openshift-api-master-okd-scos-e2e-aws-ovn

pull-ci-openshift-api-master-okd-scos-images

pull-ci-openshift-api-master-unit

pull-ci-openshift-api-master-verify

pull-ci-openshift-api-master-verify-client-go

pull-ci-openshift-api-master-verify-crd-schema

pull-ci-openshift-api-master-verify-crdify

pull-ci-openshift-api-master-verify-deps

pull-ci-openshift-api-master-verify-feature-promotion

In response to this:

/test remaining-required

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

ngopalak-redhat · 2025-09-24T13:08:23Z

/test e2e-aws-ovn
/test e2e-aws-ovn-hypershift
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial-1of2
/test e2e-aws-serial-2of2

haircommander · 2025-09-24T13:43:05Z

/retest-required

ngopalak-redhat · 2025-09-25T00:06:21Z

/retest-required

jacobsee · 2025-09-25T18:13:21Z

/retest-required

ngopalak-redhat · 2025-09-28T11:50:17Z

/retest-required

ngopalak-redhat · 2025-09-29T00:32:01Z

/retest-required

ngopalak-redhat · 2025-09-29T02:15:11Z

/verified later @BhargaviGudi

openshift-ci-robot · 2025-09-29T02:15:23Z

@ngopalak-redhat: This PR has been marked to be verified later by @BhargaviGudi.

In response to this:

/verified later @BhargaviGudi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-09-29T04:12:24Z

/retest-required

Remaining retests: 0 against base HEAD 1517fca and 2 for PR HEAD cb33f9f in total

ngopalak-redhat · 2025-09-29T06:42:43Z

/retest-required

ngopalak-redhat · 2025-09-29T06:56:58Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T07:04:42Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T07:17:47Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T07:37:39Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T08:39:53Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T09:35:53Z

/retest-required

ngopalak-redhat · 2025-09-29T11:19:26Z

/test e2e-aws-ovn-techpreview

ngopalak-redhat · 2025-09-29T15:54:13Z

/test e2e-aws-ovn-techpreview

haircommander · 2025-09-29T17:52:52Z

/retest

ngopalak-redhat · 2025-09-30T00:18:26Z

/retest-required

ngopalak-redhat · 2025-09-30T03:27:10Z

/retest-required

ngopalak-redhat · 2025-09-30T10:43:10Z

/retest-required

openshift-ci · 2025-09-30T13:37:24Z

@ngopalak-redhat: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-e2e-aws-ovn	`cb33f9f`	link	false	`/test okd-scos-e2e-aws-ovn`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2025-09-30T13:45:07Z

@ngopalak-redhat: Jira Issue OCPBUGS-62068: All pull requests linked via external trackers have merged:

openshift/api#2494

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-62068 has been moved to the MODIFIED state.

In response to this:

Setting the NodeSwap feature gate to false blocks the use of memorySwap -> swapDesired option in the KubeletConfig. With 1.34 the NodeSwap feature gate is always set to true. Hence this PR sets the NodeSwap feature gate to true for all the types of clusters.

Tested by removing the Flag completely:
Worker nodes:
 - failSwapOn: false
 - swapBehavior: NoSwap

 Control plane nodes:
 - failSwapOn: true
 - swapBehavior: NoSwap
The cluster was created with:
launch 4.21,openshift/machine-config-operator#5294,openshift/api#2494 gcp
This PR needs to be merged before openshift/machine-config-operator#5294.

This PR is tested along with openshift/machine-config-operator#5294
Fixes: https://issues.redhat.com/browse/OCPBUGS-62068

Installer using NodeSwap Feature Gate: https://github.com/openshift/installer/blob/main/pkg/types/defaults/validation/featuregates.go#L39

Since the default from upstream will be used it won't be impacted.

Also swapBehavior is controls the use of swap

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Disable Swap mode

b5a5dbe

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 23, 2025

openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 23, 2025

ngopalak-redhat changed the title ~~WIP: Draft: Disable Swap mode~~ WIP: Draft: NodeSwap Feature to be set to true always Sep 23, 2025

ngopalak-redhat mentioned this pull request Sep 23, 2025

WIP: TODO:Disable Swap mode openshift/machine-config-operator#5294

Draft

ngopalak-redhat changed the title ~~WIP: Draft: NodeSwap Feature to be set to true always~~ OCPBUGS-62068: WIP: Draft: NodeSwap Feature to be set to true always Sep 23, 2025

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 23, 2025

openshift-ci bot requested a review from mrniranjan September 23, 2025 14:39

haircommander reviewed Sep 23, 2025

View reviewed changes

haircommander mentioned this pull request Sep 23, 2025

OCPBUGS-61381: Enable DRA(DynamicResourceAllocation) featuregate by default #2498

Open

Remove NodeSwap Flag from OpenShift API

cb33f9f

openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 24, 2025

ngopalak-redhat changed the title ~~OCPBUGS-62068: WIP: Draft: NodeSwap Feature to be set to true always~~ OCPBUGS-62068: NodeSwap Feature Gate usage to be removed Sep 24, 2025

ngopalak-redhat marked this pull request as ready for review September 24, 2025 05:13

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 24, 2025

openshift-ci bot requested review from everettraven and JoelSpeed September 24, 2025 05:13

ngopalak-redhat requested a review from haircommander September 24, 2025 05:13

openshift-ci bot assigned JoelSpeed Sep 24, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2025

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Sep 29, 2025

openshift-merge-bot bot merged commit 7f24529 into openshift:master Sep 30, 2025
27 of 28 checks passed

		// NodeSwap is now GA and locked to true in Kubernetes 1.34+
		// Must be enabled to align with upstream Kubernetes behavior.

OCPBUGS-62068: NodeSwap Feature Gate usage to be removed #2494

OCPBUGS-62068: NodeSwap Feature Gate usage to be removed #2494

Uh oh!

Conversation

ngopalak-redhat commented Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Sep 23, 2025

Uh oh!

openshift-ci bot commented Sep 23, 2025

Uh oh!

openshift-ci-robot commented Sep 23, 2025

Uh oh!

openshift-ci-robot commented Sep 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ngopalak-redhat Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JoelSpeed commented Sep 23, 2025

Uh oh!

ngopalak-redhat commented Sep 24, 2025

Uh oh!

JoelSpeed commented Sep 24, 2025

Uh oh!

openshift-ci-robot commented Sep 24, 2025

Uh oh!

ngopalak-redhat commented Sep 24, 2025

Uh oh!

openshift-ci bot commented Sep 24, 2025

Uh oh!

ngopalak-redhat commented Sep 24, 2025

Uh oh!

haircommander commented Sep 24, 2025

Uh oh!

ngopalak-redhat commented Sep 25, 2025

Uh oh!

jacobsee commented Sep 25, 2025

Uh oh!

ngopalak-redhat commented Sep 28, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

openshift-ci-robot commented Sep 29, 2025

Uh oh!

openshift-ci-robot commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

Uh oh!

ngopalak-redhat commented Sep 29, 2025

ngopalak-redhat commented Sep 23, 2025 •

edited

Loading

ngopalak-redhat Sep 24, 2025 •

edited

Loading