OCPSTRAT-2876: Manifest inclusion filtering based on major version by JoelSpeed · Pull Request #2069 · openshift/library-go

JoelSpeed · 2026-01-02T13:07:41Z

Currently based on #2067

This teaches the manifest inclusion to filter based on a major-version annotation. This will allow us to concurrently build multiple major versions from a single branch while folks can include manifests (in particular feature gates) that apply only to 4, or 5, or 6 etc

openshift-ci · 2026-01-02T13:07:46Z

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 · 2026-01-22T17:06:49Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: JoelSpeed
Once this PR has been reviewed and has the lgtm label, please assign petr-muller for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

pkg/manifest/OWNERS

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

p0lyn0mial · 2026-01-28T15:55:54Z

@JoelSpeed is this PR still relevant ?

JoelSpeed · 2026-01-28T16:25:30Z

It is yes

I was having some back and forth last week with @wking and @everettraven about how we want this to look. I'm currently pausing on this for the moment while i focus on getting the CVO feature gate annotation work wrapped. But this is on the requirements list for 5.0 so I'll come back to this soon

…finition

openshift-ci-robot · 2026-01-30T14:03:13Z

@JoelSpeed: This pull request references OCPSTRAT-2876 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 feature to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Currently based on #2067

This teaches the manifest inclusion to filter based on a major-version annotation. This will allow us to concurrently build multiple major versions from a single branch while folks can include manifests (in particular feature gates) that apply only to 4, or 5, or 6 etc

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.

p0lyn0mial · 2026-02-02T16:22:39Z

But this is on the requirements list for 5.0 so I'll come back to this soon

ok, sgtm, please let me know when it is ready for review.

p0lyn0mial · 2026-02-09T14:20:52Z

/approve

/hold

I’m adding a hold so you can test the changes in the operator, if you haven’t already.

JoelSpeed · 2026-02-10T10:14:31Z

/hold cancel

I think we have enough consensus to move this forward

openshift-ci · 2026-02-10T10:45:03Z

@JoelSpeed: 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.

JianLi-RH · 2026-03-17T03:08:46Z

+		{
+			name:                "nil major version should include all",
+			annotations:         map[string]string{"release.openshift.io/major-version": "4"},
+			clusterMajorVersion: nil,


JianLi-RH · 2026-03-17T03:08:55Z

+			expectedErrorContains: "major version 4 does not match any required versions",
+		},
+		{
+			name:                "multiple inclusions - first matches",


JianLi-RH · 2026-03-17T03:09:05Z

+			expectIncluded:      true,
+		},
+		{
+			name:                "multiple inclusions - middle matches",


JianLi-RH · 2026-03-17T03:09:12Z

+			expectIncluded:      true,
+		},
+		{
+			name:                "multiple inclusions - last matches",


JianLi-RH · 2026-03-17T03:11:50Z

+			expectedErrorContains: "invalid excluded major version \"abc\" in annotation: strconv.ParseUint: parsing \"abc\": invalid syntax",
+		},
+		{
+			name:                "zero version",


JianLi-RH · 2026-03-17T03:14:34Z

+}
+
+// TestMajorVersionFilteringInteractionWithOtherFilters tests that major version filtering works alongside other filters
+func TestMajorVersionFilteringInteractionWithOtherFilters(t *testing.T) {


this is really great job!

JianLi-RH · 2026-03-19T05:22:37Z

+	case includedVersions.Has(clusterMajorVersion):
+		return nil // Found matching version, include this manifest
+	case excludedVersions.Has(clusterMajorVersion):
+		return fmt.Errorf("major version %d matches excluded version %d", clusterMajorVersion, clusterMajorVersion)


It seems the second variable in the error string should be excludedVersions.

I got logs:

2026-03-19T03:56:10.602708782Z I0319 03:56:10.602688 1 payload.go:217] excluding Filename: "0000_03_version-4-5-6-false.yaml" Group: "apiextensions.k8s.io" Kind: "CustomResourceDefinition" Name: "version-4-5-6.test.io": major version 4 matches excluded version 4

@JoelSpeed please help condifrm.

I think it is actually correct. From the case condition we know that the clusterMajorVersion is in the excludedVersions set, so even if we tried to change this to print out the excluded versions, it would just show us a list of excluded versions rather than a specific excluded version that matched.

The error message that is printed out is always correct, the 4 here was an excluded version

um, it looks strange, but anyway from the message we can know the version is excluded

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 Jan 2, 2026

JoelSpeed mentioned this pull request Jan 2, 2026

OCPSTRAT-2876: Teach config operator to filter feature gate manifests by major version inclusion openshift/cluster-config-operator#459

Merged

JoelSpeed force-pushed the manifest-inclusion-major-version branch from e409b04 to 6f6c4ca Compare January 21, 2026 17:58

JoelSpeed marked this pull request as ready for review January 22, 2026 15:42

JoelSpeed changed the title ~~[WIP] Manifest inclusion filtering based on major version~~ Manifest inclusion filtering based on major version Jan 22, 2026

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 Jan 22, 2026

openshift-ci Bot requested review from deads2k and p0lyn0mial January 22, 2026 15:49

JoelSpeed force-pushed the manifest-inclusion-major-version branch from aeb7ced to 0cba804 Compare January 22, 2026 17:18

Add major version filtering for manifests

c5ea32a

JoelSpeed force-pushed the manifest-inclusion-major-version branch 3 times, most recently from 73e3e1c to 6e5ccfd Compare January 30, 2026 12:17

Restrict major version annotation to FeatureGate and CustomResourceDe…

6f4c21d

…finition

JoelSpeed force-pushed the manifest-inclusion-major-version branch from 6e5ccfd to 6f4c21d Compare January 30, 2026 14:01

JoelSpeed changed the title ~~Manifest inclusion filtering based on major version~~ OCPSTRAT-2876: Manifest inclusion filtering based on major version Jan 30, 2026

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

p0lyn0mial added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 9, 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 Feb 10, 2026

openshift-merge-bot Bot merged commit 1b1e12b into openshift:master Feb 10, 2026
4 checks passed

JianLi-RH reviewed Mar 17, 2026

View reviewed changes

Comment thread pkg/manifest/manifest_test.go

expectIncluded: true,

},

{

name: "multiple inclusions - last matches",

Copy link
Copy Markdown

JianLi-RH Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awsome

JianLi-RH reviewed Mar 17, 2026

View reviewed changes

JianLi-RH reviewed Mar 19, 2026

View reviewed changes

Conversation

JoelSpeed commented Jan 2, 2026

Uh oh!

openshift-ci Bot commented Jan 2, 2026

Uh oh!

openshift-ci Bot commented Jan 22, 2026

Uh oh!

p0lyn0mial commented Jan 28, 2026

Uh oh!

JoelSpeed commented Jan 28, 2026

Uh oh!

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

Uh oh!

Uh oh!

p0lyn0mial commented Feb 2, 2026

Uh oh!

p0lyn0mial commented Feb 9, 2026

Uh oh!

JoelSpeed commented Feb 10, 2026

Uh oh!

openshift-ci Bot commented Feb 10, 2026

Uh oh!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

openshift-ci-robot commented Jan 30, 2026 •

edited by openshift-ci Bot

Loading