OKD-259: Test OKD Feature set Against OKD and OCP clusters by jatinsu · Pull Request #30693 · openshift/origin

jatinsu · 2026-01-15T16:13:30Z

This test checks for OKD and OCP clusters and attempts to enable the OKD featureset against them. If it's a OKD cluster, it should be able to enabled, but if it's a OCP cluster it should reject.

Kubenertes PR for context: openshift/kubernetes#2420

openshift-ci-robot · 2026-01-15T16:13:35Z

@jatinsu: This pull request references OKD-259 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This test checks for OKD and OCP clusters and attempts to enable the OKD featureset against them. If it's a OKD cluster, it should be able to enabled, but if it's a OCP cluster it should reject.

Kubenertes PR for context: openshift/kubernetes#2420

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 · 2026-01-15T16:14:04Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

test/extended/apiserver/featuregate_okd.go

openshift-ci-robot · 2026-01-15T17:41:55Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn-upgrade-rollback
/test e2e-metal-ovn-two-node-fencing

jatinsu · 2026-01-19T19:03:57Z

/retest

openshift-trt · 2026-01-19T23:12:44Z

Risk analysis has seen new tests most likely introduced by this PR.
Please ensure that new tests meet guidelines for naming and stability.

New Test Risks for sha: 4459b59

Job Name	New Test Risk
pull-ci-openshift-origin-main-e2e-aws-ovn-fips	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-gcp-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-metal-ipi-ovn-ipv6	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-metal-ovn-two-node-fencing	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-vsphere-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-vsphere-ovn-upi	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 2 time(s) against the current commit

New tests seen in this PR at sha: 4459b59

"[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should validate OKD featureset based on cluster type [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" [Total: 12, Pass: 0, Fail: 12, Flake: 0]

openshift-ci-robot · 2026-01-19T23:39:04Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn-upgrade-rollback
/test e2e-metal-ovn-two-node-fencing

openshift-trt · 2026-01-20T03:36:27Z

Risk analysis has seen new tests most likely introduced by this PR.
Please ensure that new tests meet guidelines for naming and stability.

New Test Risks for sha: 4a68aba

Job Name	New Test Risk
pull-ci-openshift-origin-main-e2e-aws-ovn-fips	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-gcp-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-metal-ipi-ovn-ipv6	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-vsphere-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-vsphere-ovn-upi	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit

New tests seen in this PR at sha: 4a68aba

"[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" [Total: 5, Pass: 0, Fail: 5, Flake: 0]

benluddy · 2026-01-21T18:39:37Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.22-e2e-gcp-ovn openshift/kubernetes#2420

openshift-ci · 2026-01-21T18:39:42Z

@benluddy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.22-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8a7a0460-f6f8-11f0-9c02-c6f07dd2780f-0

…clusters Test now checks for OKD clusters that already have featureset enabled Simplfied test to only test ocp clusters

openshift-ci-robot · 2026-01-26T21:19:56Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn-upgrade-rollback
/test e2e-metal-ovn-two-node-fencing

bertinatto

Would it be possible to schedule a OKD job to make sure this test is skipped there?

bertinatto · 2026-01-27T20:08:57Z

test/e2e/upgrade/monitor.go


 	if cv.Status.ObservedGeneration > initialGeneration {
-		if cv.Spec.DesiredUpdate == nil || desired != *cv.Spec.DesiredUpdate {
+		if cv.Spec.DesiredUpdate == nil || !reflect.DeepEqual(desired, *cv.Spec.DesiredUpdate) {


This was clearly wrong, good catch. However, this change is unrelated to this commit, right?

This change is unrelated to this commit

By commit do you mean this PR in general or the commit Fixed monitor and imagepolicy.go errors from vendoring? The reason for these changes is for some reason after vendoring the API repo both monitor.go and imagepolicy.go would throw errors. I decided to keep it in a separate commit rather than putting it in the Vendor API commit as I'm manually editing code, but I can squash it into the Vendored API repo commit if you'd like.

I meant the commit Fixed monitor and imagepolicy.go errors from vendoring. Thanks for clarifying. I thought this change wasn't related to the commit.

bertinatto · 2026-01-27T20:10:47Z

test/extended/imagepolicy/imagepolicy.go

 			Spec: configv1.ClusterImagePolicySpec{
 				Scopes: []configv1.ImageScope{testSignedPolicyScope},
-				Policy: configv1.Policy{
+				Policy: configv1.ImageSigstoreVerificationPolicy{


@sanchezl since you authored openshift/api#2626, could you take a look at these changes?

For some context, unit tests would fail without this change as I vendored the API repo

bertinatto

/lgtm

bertinatto · 2026-01-28T11:26:07Z

test/e2e/upgrade/monitor.go


 	if cv.Status.ObservedGeneration > initialGeneration {
-		if cv.Spec.DesiredUpdate == nil || desired != *cv.Spec.DesiredUpdate {
+		if cv.Spec.DesiredUpdate == nil || !reflect.DeepEqual(desired, *cv.Spec.DesiredUpdate) {


I meant the commit Fixed monitor and imagepolicy.go errors from vendoring. Thanks for clarifying. I thought this change wasn't related to the commit.

openshift-ci · 2026-01-28T11:26:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, jatinsu

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bertinatto]

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

bertinatto · 2026-01-28T11:27:31Z

/hold
For #30693 (review). Please check if this is possible.

jatinsu · 2026-01-28T16:50:06Z

Would it be possible to schedule a OKD job to make sure this test is skipped there?

We test upgrades regularly as part of our nightly releases so a test for this seems kind of redundant for OKD. The featureset will be enabled by default on OKD clusters, and as Ben said it would be hard to miss if the OKD featureset is blocked on OKD.

bertinatto · 2026-01-29T06:37:21Z

/hold cancel

jatinsu · 2026-01-29T14:12:50Z

/retest

jatinsu · 2026-01-29T19:26:27Z

/verified by @jatinsu

Prashanth684 · 2026-02-02T22:34:21Z

/verified bypass

openshift-ci-robot · 2026-02-02T22:34:32Z

@Prashanth684: The verified label has been added.

Details

In response to this:

/verified bypass

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 · 2026-02-02T22:50:34Z

/retest-required

Remaining retests: 0 against base HEAD 2dfa4fd and 2 for PR HEAD c634816 in total

jatinsu · 2026-02-03T15:43:20Z

/test e2e-metal-ipi-ovn-ipv6

jatinsu · 2026-02-03T16:11:14Z

/test e2e-metal-ipi-ovn-ipv6

Prashanth684 · 2026-02-03T17:05:35Z

/retest-required

Prashanth684 · 2026-02-03T21:23:54Z

/override ci/prow/e2e-metal-ipi-ovn-ipv6

openshift-ci · 2026-02-03T21:24:01Z

@Prashanth684: Overrode contexts on behalf of Prashanth684: ci/prow/e2e-metal-ipi-ovn-ipv6

Details

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-ipv6

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-ci · 2026-02-03T21:24:02Z

@jatinsu: 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/e2e-metal-ovn-two-node-fencing	`c634816`	link	false	`/test e2e-metal-ovn-two-node-fencing`

Full PR test history. Your PR dashboard.

Details

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 · 2026-02-03T23:50:35Z

/retest-required

Remaining retests: 0 against base HEAD 2b2156b and 1 for PR HEAD c634816 in total

openshift-trt · 2026-02-04T04:17:03Z

Job Failure Risk Analysis for sha: c634816

Job Name	Failure Risk
pull-ci-openshift-origin-main-e2e-metal-ipi-ovn-ipv6	IncompleteTests Tests for this run (14) are below the historical average (3015): IncompleteTests (not enough tests ran to make a reasonable risk analysis; this could be due to infra, installation, or upgrade problems)

Risk analysis has seen new tests most likely introduced by this PR.
Please ensure that new tests meet guidelines for naming and stability.

New Test Risks for sha: c634816

Job Name	New Test Risk
pull-ci-openshift-origin-main-e2e-aws-ovn-fips	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-gcp-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that failed 1 time(s) against the current commit
pull-ci-openshift-origin-main-e2e-metal-ipi-ovn-ipv6	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that was not present in all runs against the current commit, and also failed 1 time(s).
pull-ci-openshift-origin-main-e2e-metal-ovn-two-node-fencing	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that was not present in all runs against the current commit, and also failed 1 time(s).
pull-ci-openshift-origin-main-e2e-vsphere-ovn	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that was not present in all runs against the current commit, and also failed 1 time(s).
pull-ci-openshift-origin-main-e2e-vsphere-ovn-upi	High - "[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" is a new test that was not present in all runs against the current commit, and also failed 1 time(s).

New tests seen in this PR at sha: c634816

"[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]" [Total: 24, Pass: 18, Fail: 6, Flake: 0]

theobarberbany · 2026-02-05T10:13:27Z

We've not accounted for an edge case here on techpreview clusters:

: [sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD] should reject OKD featureset on OCP clusters [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel] expand_less | 2s
-- | --
{  fail [github.com/openshift/origin/test/extended/apiserver/featuregate_okd.go:52]:
 Expected     <string>: FeatureGate.config.openshift.io "cluster" is invalid: spec.featureSet: Invalid value: "string": TechPreviewNoUpgrade may not be changed

to contain substring     <string>: OKD featureset is not supported on OpenShift clusters}

I reckon we probably want to also skip this test on TechPreview/CustomNoUpgrade clusters :)

All of our tech preview jobs on cluster-capi-operator are now failing, can you PTAL @jatinsu

cc @Prashanth684 @bertinatto as reviewers

edit: just seen #30757

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 15, 2026

openshift-ci bot requested review from deads2k and sjenning January 15, 2026 16:15

openshift-ci bot added the vendor-update Touching vendor dir or related files label Jan 15, 2026

jatinsu commented Jan 15, 2026

View reviewed changes

test/extended/apiserver/featuregate_okd.go Outdated Show resolved Hide resolved

jatinsu force-pushed the OKD-kubeneretes-test branch 2 times, most recently from 20c9964 to 45e89b6 Compare January 15, 2026 16:58

openshift-ci bot mentioned this pull request Jan 21, 2026

OKD-259: Validate OKD featureset to prevent it from being enabled on OCP clusters openshift/kubernetes#2420

Merged

jatinsu force-pushed the OKD-kubeneretes-test branch from 4a68aba to 7e106ba Compare January 26, 2026 20:50

jatinsu added 3 commits January 26, 2026 15:52

Vendored API repo

9016de2

Fixed monitor and imagepolicy.go errors from vendoring

66f4f2d

Added a test that checks if the OKD featureset can be enabled on OCP …

c634816

…clusters Test now checks for OKD clusters that already have featureset enabled Simplfied test to only test ocp clusters

jatinsu force-pushed the OKD-kubeneretes-test branch from 7e106ba to c634816 Compare January 26, 2026 20:53

bertinatto reviewed Jan 27, 2026

View reviewed changes

bertinatto reviewed Jan 28, 2026

View reviewed changes

openshift-ci bot assigned bertinatto Jan 28, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2026

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 28, 2026

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 28, 2026

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 29, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Feb 2, 2026

openshift-merge-bot bot merged commit 9b50a28 into openshift:main Feb 4, 2026
21 of 22 checks passed

theobarberbany mentioned this pull request Feb 5, 2026

OCPCLOUD-3327: Fix up related objects openshift/cluster-capi-operator#452

Merged

Conversation

jatinsu commented Jan 15, 2026

Uh oh!

openshift-ci-robot commented Jan 15, 2026 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 15, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 15, 2026

Uh oh!

jatinsu commented Jan 19, 2026

Uh oh!

openshift-trt bot commented Jan 19, 2026

Uh oh!

openshift-ci-robot commented Jan 19, 2026

Uh oh!

openshift-trt bot commented Jan 20, 2026

Uh oh!

benluddy commented Jan 21, 2026

Uh oh!

openshift-ci bot commented Jan 21, 2026

Uh oh!

openshift-ci-robot commented Jan 26, 2026

Uh oh!

bertinatto left a comment

Choose a reason for hiding this comment

Uh oh!

bertinatto Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

jatinsu Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

bertinatto Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

bertinatto Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

jatinsu Jan 27, 2026 • 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!

bertinatto left a comment

Choose a reason for hiding this comment

Uh oh!

bertinatto Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jan 28, 2026

Uh oh!

bertinatto commented Jan 28, 2026

Uh oh!

jatinsu commented Jan 28, 2026

Uh oh!

bertinatto commented Jan 29, 2026

Uh oh!

jatinsu commented Jan 29, 2026

Uh oh!

jatinsu commented Jan 29, 2026

Uh oh!

Prashanth684 commented Feb 2, 2026

Uh oh!

openshift-ci-robot commented Feb 2, 2026

Uh oh!

openshift-ci-robot commented Feb 2, 2026

Uh oh!

jatinsu commented Feb 3, 2026

Uh oh!

jatinsu commented Feb 3, 2026

Uh oh!

Prashanth684 commented Feb 3, 2026

Uh oh!

Prashanth684 commented Feb 3, 2026

Uh oh!

openshift-ci bot commented Feb 3, 2026

Uh oh!

openshift-ci bot commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

openshift-ci-robot commented Jan 15, 2026 •

edited by openshift-ci bot

Loading

jatinsu Jan 27, 2026 •

edited

Loading

openshift-ci bot commented Feb 3, 2026 •

edited

Loading

theobarberbany commented Feb 5, 2026 •

edited

Loading