Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 2, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27dec8d
Add function to check control plane is schedulable
mrniranjan Sep 23, 2025
3bb4fef
Skip Node selector tests when control planes are schedulable
mrniranjan Sep 23, 2025
8d30a26
Use openshift api to fetch control plane nodes schedulable info
mrniranjan Sep 24, 2025
516d0e8
Get rest config required to access api server
mrniranjan Sep 24, 2025
edfbe28
Pass context.TODO() to IsControlPlaneSchedulable function
mrniranjan Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions test/e2e/performanceprofile/functests/2_performance_update/updating_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
testutils "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/cgroup/runtime"
testclient "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/client"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/cluster"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/discovery"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/hypershift"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/label"
Expand Down Expand Up @@ -404,6 +405,12 @@ var _ = Describe("[rfe_id:28761][performance] Updating parameters in performance
if len(nonPerformancesWorkers) > 1 {
newCnfNode = &nonPerformancesWorkers[0]
}
ok, err := cluster.IsControlPlaneSchedulable(context.TODO())
Expect(err).ToNot(HaveOccurred(), "Unable to fetch schedulable information of control plane nodes: %v", err)
if ok {
Skip("Skipping the test - Control plane nodes are schedulable")
}

if newCnfNode == nil {
Skip("Skipping the test - cluster does not have another available worker node ")
}
Expand Down
22 changes: 20 additions & 2 deletions test/e2e/performanceprofile/functests/utils/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import (
"context"
"time"

clientconfigv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
testclient "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/client"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

testclient "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"
)

// IsSingleNode validates if the environment is single node cluster
Expand All @@ -29,3 +31,19 @@ func ComputeTestTimeout(baseTimeout time.Duration, isSno bool) time.Duration {

return testTimeout
}

// Check if the control plane nodes are schedulable, returns true if schedulable else false
func IsControlPlaneSchedulable(ctx context.Context) (bool, error) {
// Get the rest.Config using the helper function
cfg, err := config.GetConfig()
if err != nil {
return false, err
}

openshiftConfigClient := clientconfigv1.NewForConfigOrDie(cfg)
schedulerInfo, err := openshiftConfigClient.Schedulers().Get(ctx, "cluster", metav1.GetOptions{})
if err != nil {
return false, err
}
return schedulerInfo.Spec.MastersSchedulable, nil
}