OCPBUGS-62091: E2E: Add function to check control plane nodes are schedulable. #1396

mrniranjan · 2025-09-23T08:17:24Z

This PR adds util function to check if Control plane nodes are schedulable and
if so skips Node selector tests

Signed-off-by: Niranjan M.R <[email protected]>

Skip Node selector tests when control plane nodes are schedulable since this tests primarily adds and deletes mcp on worker nodes and modifies the performance profile appropriately. This test is not applicable when control plane nodes are schedulable and we are relying on performance profile applied to control plane nodes Signed-off-by: Niranjan M.R <[email protected]>

openshift-ci-robot · 2025-09-23T08:24:08Z

@mrniranjan: This pull request references Jira Issue OCPBUGS-62091, 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:

This PR adds util function to check if Control plane nodes are schedulable and
if so skips Node selector tests

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 · 2025-09-23T08:24:12Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: mrniranjan.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@mrniranjan: This pull request references Jira Issue OCPBUGS-62091, 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:

This PR adds util function to check if Control plane nodes are schedulable and
if so skips Node selector tests

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.

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.

MarSik · 2025-09-23T10:58:07Z

test/e2e/performanceprofile/functests/utils/cluster/cluster.go

+		return false, err
+	}
+
+	if len(controlPlaneNodes.Items) == 0 {


I wonder if this is the right way. Why not check the cluster configuration?

oc get scheduler cluster -o yaml
check mastersSchedulable

that could be the more elegant approach I was hinting :)

@MarSik @ffromani request to review the latest commit

mrniranjan · 2025-09-24T06:03:51Z

/retest

Signed-off-by: Niranjan M.R <[email protected]>

MarSik

/lgtm

openshift-ci · 2025-09-24T13:23:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MarSik, mrniranjan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [MarSik]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

shajmakh · 2025-09-24T13:33:13Z

test/e2e/performanceprofile/functests/utils/cluster/cluster.go

-	if err := testclient.DataPlaneClient.List(context.TODO(), controlPlaneNodes, &client.ListOptions{LabelSelector: selector}); err != nil {
+// Check if the control plane nodes are schedulable, returns true if schedulable else false
+func IsControlPlaneSchedulable(ctx context.Context) (bool, error) {
+	cfg, err := testclient.GetRestConfigFromClient(testclient.Client)


why is this config needed? can't this be done using simple client Get():

scheduler := &configv1.Scheduler{} Expect(testclient.DataPlaneClient.Get(ctx, client.ObjectKey{Name: "cluster"}, scheduler)).ToNot(HaveOccurred()) return scheduler.Spec.mastersSchedulable

@shajmakh
Because we are adding mastersSchedulable to true in "cluster" resource. and the API to fetch this information is available using "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1" which requires rest client

@shajmakh
scheduler := &configv1.Scheduler{} ,
this is not possible, We can access scheduler after we create a new variable of configv1 struct

openshiftConfigClient := clientconfigv1.NewForConfigOrDie(<rest config>) openshiftConfigClient.Schedulers().Get

Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan · 2025-09-24T14:31:46Z

@MarSik did some minor changes, Could you review again

Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan · 2025-09-25T01:33:31Z

/retest

ffromani

/lgtm

mrniranjan · 2025-09-25T06:16:15Z

/test okd-scos-e2e-aws-ovn

mrniranjan · 2025-09-25T07:26:25Z

/verified by @mrniranjan

openshift-ci-robot · 2025-09-25T07:26:38Z

@mrniranjan: This PR has been marked as verified by @mrniranjan.

In response to this:

/verified by @mrniranjan

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-25T07:30:47Z

@mrniranjan: Jira Issue Verification Checks: Jira Issue OCPBUGS-62091
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-62091 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

This PR adds util function to check if Control plane nodes are schedulable and
if so skips Node selector tests

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.

mrniranjan · 2025-09-25T07:33:19Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2025-09-25T07:34:13Z

@mrniranjan: new pull request created: #1398

In response to this:

/cherry-pick release-4.20

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.

openshift-merge-robot · 2025-09-27T10:37:24Z

Fix included in accepted release 4.21.0-0.nightly-2025-09-27-045323

mrniranjan added 2 commits September 23, 2025 12:38

Add function to check control plane is schedulable

d9c78ff

Signed-off-by: Niranjan M.R <[email protected]>

openshift-ci bot requested review from Tal-or and jmencak September 23, 2025 08:18

mrniranjan changed the title ~~E2E: Add function to check control plane nodes are schedulable.~~ OCPBUGS-62091: E2E: Add function to check control plane nodes are schedulable. 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

MarSik reviewed Sep 23, 2025

View reviewed changes

Use openshift api to fetch control plane nodes schedulable info

985a1b6

Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan force-pushed the check_sched_ctrl_plane branch from 59ba31e to 985a1b6 Compare September 24, 2025 12:51

MarSik approved these changes Sep 24, 2025

View reviewed changes

openshift-ci bot assigned MarSik Sep 24, 2025

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

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2025

shajmakh reviewed Sep 24, 2025

View reviewed changes

Get rest config required to access api server

4072797

Signed-off-by: Niranjan M.R <[email protected]>

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

Pass context.TODO() to IsControlPlaneSchedulable function

4c17e06

Signed-off-by: Niranjan M.R <[email protected]>

ffromani reviewed Sep 25, 2025

View reviewed changes

openshift-ci bot assigned ffromani Sep 25, 2025

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

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 25, 2025

openshift-merge-bot bot merged commit b5d66f8 into openshift:main Sep 25, 2025
18 of 19 checks passed

openshift-cherrypick-robot mentioned this pull request Sep 25, 2025

[release-4.20] OCPBUGS-62214: E2E: Add function to check control plane nodes are schedulable. #1398

Merged

OCPBUGS-62091: E2E: Add function to check control plane nodes are schedulable. #1396

OCPBUGS-62091: E2E: Add function to check control plane nodes are schedulable. #1396

Uh oh!

Conversation

mrniranjan commented Sep 23, 2025

Uh oh!

openshift-ci-robot commented Sep 23, 2025

Uh oh!

openshift-ci bot commented Sep 23, 2025

Uh oh!

MarSik Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

ffromani Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

mrniranjan Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

mrniranjan commented Sep 24, 2025

Uh oh!

MarSik left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Sep 24, 2025

Uh oh!

shajmakh Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

mrniranjan Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

mrniranjan Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

mrniranjan commented Sep 24, 2025

Uh oh!

mrniranjan commented Sep 25, 2025

Uh oh!

ffromani left a comment

Choose a reason for hiding this comment

Uh oh!

mrniranjan commented Sep 25, 2025

Uh oh!

mrniranjan commented Sep 25, 2025

Uh oh!

openshift-ci-robot commented Sep 25, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 25, 2025

Uh oh!

mrniranjan commented Sep 25, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 25, 2025

Uh oh!

openshift-merge-robot commented Sep 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants