OCPBUGS-71236: Align featureGate validations with openshift #6138

copejon · 2026-01-23T22:57:17Z

No description provided.

openshift-ci-robot · 2026-01-23T22:57:23Z

@copejon: This pull request references Jira Issue OCPBUGS-71236, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

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 · 2026-01-23T22:57:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: copejon

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~~ [copejon]

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

copejon · 2026-01-26T15:15:58Z

TODO: I need to update rf featuregate tests

agullon · 2026-01-27T10:00:23Z

it looks good to me

pmtk · 2026-01-27T15:39:00Z

Makefile


 # Set variables for test-unit target
 GO_TEST_FLAGS=$(GO_BUILD_FLAGS)
+GO_TEST_ARGS=$(GO_LD_FLAGS)


I can't find it being used anywhere either in our code or deps/ or vendor/. Why do we need it?

This is to enable unit testing featuregate prerun functions that handle version skew validation for upgrade/downgrades.

I'm glad you pointed this out. Relying on the buildflag version values wasn't entirely in line with how the unit tests were checking the validation functions. The cleaner solution was to mock the function that validation used to get the compiled version values and override it in tests to manipulate the version values as needed.

pkg/admin/prerun/featuregate_lock.go

copejon · 2026-01-28T20:39:29Z

/jira refresh

openshift-ci-robot · 2026-01-28T20:39:37Z

@copejon: This pull request references Jira Issue OCPBUGS-71236, 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.22.0) matches configured target version for branch (4.22.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jogeo

Details

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.

removed: RF tests related to version detection. these are covered sufficiently by unit tests

Added getExecutableVersion function variable to allow mocking the executable version in tests (the version is normally set via ldflags at compile time, making it impossible to test upgrade/downgrade scenarios without mocking) Updated TestFeatureGateLockManagement_FirstRun, TestFeatureGateLockManagement_ConfigChange, and TestFeatureGateLockManagement_VersionChange to mock the version instead of relying on ldflags Removed GO_TEST_ARGS from Makefile since ldflags are no longer required for unit tests

copejon · 2026-01-29T15:13:13Z

/cherrypick release-4.21

openshift-cherrypick-robot · 2026-01-29T15:13:17Z

@copejon: once the present PR merges, I will cherry-pick it on top of release-4.21 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.21

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.

test/suites/standard2/feature-gates.robot

agullon · 2026-01-29T17:13:45Z

pkg/config/config_test.go

-		{
-			name: "feature-gates-custom-no-upgrade-with-feature-set-empty",
-			config: func() *Config {
-				c := mkDefaultConfig()
-				c.ApiServer.FeatureGates.FeatureSet = ""
-				c.ApiServer.FeatureGates.CustomNoUpgrade.Enabled = []string{"feature1"}
-				c.ApiServer.FeatureGates.CustomNoUpgrade.Disabled = []string{"feature2"}
-				return c
-			}(),
-			expectErr: true,
-		},


because you are removing this test, I understand the following configuration is a valid one, right? If so, I'd prefer to change the expectErr: to false

apiServer: featureGates: featureSet: "" customNoUpgrade: enabled: - "CPUManagerPolicyBetaOptions"

Right, the case is not validated. I'll re-add and set expectErr to false.

agullon · 2026-01-29T17:14:40Z

pkg/config/config_test.go

-				c.ApiServer.FeatureGates.CustomNoUpgrade.Disabled = []string{"feature2"}
-				return c
-			}(),
-			expectErr: true,


Wouldn't be better to change the expectErr instead of removing the whole test?

Will revert and flip expectErr

… typo in feature-gates.robot

copejon · 2026-01-29T21:31:48Z

/verified by copejon,ci

openshift-ci-robot · 2026-01-29T21:32:00Z

@copejon: This PR has been marked as verified by copejon,ci.

Details

In response to this:

/verified by copejon,ci

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 · 2026-01-29T21:39:56Z

@copejon: all tests passed!

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 added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 23, 2026

openshift-ci bot requested review from ggiguash and pacevedom January 23, 2026 22:57

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

copejon force-pushed the ocpbugs-71236-validation branch from f83244c to 96c9356 Compare January 26, 2026 23:06

pmtk reviewed Jan 27, 2026

View reviewed changes

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 28, 2026

openshift-ci bot requested a review from jogeo January 28, 2026 20:39

copejon added 2 commits January 28, 2026 16:09

aligned microshift featuregate validations with openshift

c9898f5

fixed: prerun validation should check execuatble version

a27e240

removed: RF tests related to version detection. these are covered sufficiently by unit tests

copejon force-pushed the ocpbugs-71236-validation branch from 4d4f5b6 to a27e240 Compare January 28, 2026 22:10

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2026

fix verify

c032c97

agullon reviewed Jan 29, 2026

View reviewed changes

test/suites/standard2/feature-gates.robot Outdated Show resolved Hide resolved

agullon reviewed Jan 29, 2026

View reviewed changes

add test cases for feature gates validation in config_test.go and fix…

1b26bf2

… typo in feature-gates.robot

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

OCPBUGS-71236: Align featureGate validations with openshift #6138

Are you sure you want to change the base?

OCPBUGS-71236: Align featureGate validations with openshift #6138

Conversation

copejon commented Jan 23, 2026

Uh oh!

openshift-ci-robot commented Jan 23, 2026

Uh oh!

openshift-ci bot commented Jan 23, 2026

Uh oh!

copejon commented Jan 26, 2026

Uh oh!

agullon commented Jan 27, 2026

Uh oh!

pmtk Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

copejon commented Jan 28, 2026

Uh oh!

openshift-ci-robot commented Jan 28, 2026

Uh oh!

copejon commented Jan 29, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 29, 2026

Uh oh!

Uh oh!

agullon Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

agullon Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

copejon commented Jan 29, 2026

Uh oh!

openshift-ci-robot commented Jan 29, 2026

Uh oh!

openshift-ci bot commented Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants