Skip to content

[release-4.21] OCPBUGS-82064: Assert CNI version greater than equal to 1.0.0#30977

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
arkadeepsen:bump-cni-version-4.21
Apr 14, 2026
Merged

[release-4.21] OCPBUGS-82064: Assert CNI version greater than equal to 1.0.0#30977
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
arkadeepsen:bump-cni-version-4.21

Conversation

@arkadeepsen
Copy link
Copy Markdown
Member

@arkadeepsen arkadeepsen commented Apr 7, 2026

This PR asserts CNI version is greater than equal to 1.0.0 in the 4.21 branch. The related tests on the 4.22 -> 4.21 branch sync PR is failing due to the CNI version mismatch: openshift/ovn-kubernetes#3087

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 7, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: fd67b8f1-9c85-44d3-96df-97f34d965e67

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@arkadeepsen
Copy link
Copy Markdown
Member Author

/jira cherrypick OCPBUGS-82046

@openshift-ci openshift-ci bot requested review from kyrtapz and miheer April 7, 2026 15:03
@openshift-ci-robot
Copy link
Copy Markdown

@arkadeepsen: Jira Issue OCPBUGS-82046 has been cloned as Jira Issue OCPBUGS-82064. Will retitle bug to link to clone.
/retitle OCPBUGS-82064: Bump CNI version to 1.1.0

Details

In response to this:

/jira cherrypick OCPBUGS-82046

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 openshift-ci bot changed the title Bump CNI version to 1.1.0 OCPBUGS-82064: Bump CNI version to 1.1.0 Apr 7, 2026
@openshift-ci-robot 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 Apr 7, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arkadeepsen: This pull request references Jira Issue OCPBUGS-82064, which is invalid:

  • expected dependent Jira Issue OCPBUGS-82046 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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:

This PR bumps the CNI version to 1.1.0 in the 4.21 branch. The related tests on the 4.22 -> 4.21 branch sync PR is failing due to the CNI version mismatch: openshift/ovn-kubernetes#3087

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.

@arkadeepsen arkadeepsen changed the title OCPBUGS-82064: Bump CNI version to 1.1.0 [release-4.21] OCPBUGS-82064: Bump CNI version to 1.1.0 Apr 7, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 7, 2026

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ca6b0310-3296-11f1-953a-3eec175873ae-0

@arkadeepsen
Copy link
Copy Markdown
Member Author

/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

@arkadeepsen
Copy link
Copy Markdown
Member Author

/skip

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f0f99610-32ee-11f1-9ea2-b6c28c658aa1-0

@arkadeepsen
Copy link
Copy Markdown
Member Author

The following tests are failing in e2e-aws-ovn-fips, e2e-gcp-ovn, e2e-vsphere-ovn, e2e-vsphere-ovn-upi due to the CNI version mismatch. It is expecting 1.1.0 but the current openshift/ovn-kubernetes@release-4.21 branch is having a version of 1.0.0.

: [sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes UserDefinedNetwork CRD controller should create NetworkAttachmentDefinition according to spec [Suite:openshift/conformance/parallel]
: [sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes ClusterUserDefinedNetwork CRD Controller should create NAD according to spec in each target namespace and report active namespaces [Suite:openshift/conformance/parallel]
: [sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes ClusterUserDefinedNetwork CRD Controller should create NAD in new created namespaces that apply to namespace-selector [Suite:openshift/conformance/parallel]
: [sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes ClusterUserDefinedNetwork CRD Controller when namespace-selector is mutated should create NAD in namespaces that apply to mutated namespace-selector [Suite:openshift/conformance/parallel]

The payload job ran with openshift/ovn-kubernetes#3087 was successful since the branch sync PR is bumping the CNI version to 1.1.0.

@arkadeepsen
Copy link
Copy Markdown
Member Author

/test e2e-gcp-ovn-upgrade

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b24e2180-336e-11f1-8eef-893f056ce8e5-0

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1aba7c50-34ff-11f1-8881-f5621743b1c0-0

@jluhrsen
Copy link
Copy Markdown
Contributor

/verified by running with these two PRs openshift/ovn-kubernetes#3087 openshift/multus-cni#284

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 11, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jluhrsen: This PR has been marked as verified by running with these two PRs https://github.com/openshift/ovn-kubernetes/pull/3087 https://github.com/openshift/multus-cni/pull/284.

Details

In response to this:

/verified by running with these two PRs openshift/ovn-kubernetes#3087 openshift/multus-cni#284

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.

@arkadeepsen
Copy link
Copy Markdown
Member Author

/jira refresh

@openshift-ci-robot 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 Apr 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arkadeepsen: This pull request references Jira Issue OCPBUGS-82064, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-82046 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-82046 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

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

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.

@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Apr 13, 2026
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Apr 13, 2026
@arkadeepsen arkadeepsen force-pushed the bump-cni-version-4.21 branch from 9a93376 to 6800234 Compare April 13, 2026 09:09
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 13, 2026

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0

@arkadeepsen
Copy link
Copy Markdown
Member Author

/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

@arkadeepsen
Copy link
Copy Markdown
Member Author

/retest-required

@arkadeepsen arkadeepsen force-pushed the bump-cni-version-4.21 branch from 6800234 to d91bdef Compare April 13, 2026 14:06
@arkadeepsen
Copy link
Copy Markdown
Member Author

@arkadeepsen arkadeepsen changed the title [release-4.21] OCPBUGS-82064: Bump CNI version to 1.1.0 [release-4.21] OCPBUGS-82064: Assert CNI version greater than equal to 1.0.0 Apr 13, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arkadeepsen: This PR has been marked as verified by https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0.

Details

In response to this:

/verified by https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0

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
Copy link
Copy Markdown

@arkadeepsen: This pull request references Jira Issue OCPBUGS-82064, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-82046 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-82046 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

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

Details

In response to this:

This PR asserts CNI version is greater than equal to 1.0.0 in the 4.21 branch. The related tests on the 4.22 -> 4.21 branch sync PR is failing due to the CNI version mismatch: openshift/ovn-kubernetes#3087

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.

@arkadeepsen
Copy link
Copy Markdown
Member Author

/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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 13, 2026

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

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Apr 14, 2026

/lgtm

err := json.Unmarshal([]byte(nad.Spec.Config), &cniConfig)
Expect(err).NotTo(HaveOccurred())

Expect(cniversion.GreaterThanOrEqualTo(cniConfig.CNIVersion, "1.0.0")).To(BeTrue())
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A non actionable note: This isn't really necessary considering we do an exact cniVersion match below, right?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Added the line to verify if the CNI version is supported or not. It similar to this line: https://github.com/openshift/multus-cni/pull/284/changes#diff-f73ae23ad49258f5cdb5ffb37a1ccd4ace837549e44905f1a9ef2c5d5b0e9d37R508

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2026
@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Apr 14, 2026

@arkadeepsen you will need an approve from TRT: https://github.com/openshift/origin/blob/release-4.21/OWNERS

@mkowalski
Copy link
Copy Markdown
Contributor

/approve

@smg247
Copy link
Copy Markdown
Member

smg247 commented Apr 14, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen, kyrtapz, mkowalski, smg247

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit e6cd3ea into openshift:release-4.21 Apr 14, 2026
21 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@arkadeepsen: Jira Issue Verification Checks: Jira Issue OCPBUGS-82064
✔️ 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-82064 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This PR asserts CNI version is greater than equal to 1.0.0 in the 4.21 branch. The related tests on the 4.22 -> 4.21 branch sync PR is failing due to the CNI version mismatch: openshift/ovn-kubernetes#3087

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.

@arkadeepsen arkadeepsen deleted the bump-cni-version-4.21 branch April 14, 2026 10:53
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in release 4.21.0-0.nightly-2026-04-14-123546

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants