Skip to content

OCPBUGS-54426: Fix implementation of ContainsCIDR to allow non-equal addresses #2263

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.

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

Conversation

JoelSpeed
Copy link

This has already merged into the main and 1.33 branch of K/K, but we are waiting on cherry-pick approval for the 1.32 branch.

This updates the implementation of the CEL CIDR matching check which was rejecting some valid values.

@openshift-ci-robot openshift-ci-robot added backports/validated-commits Indicates that all commits come to merged upstream PRs. 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 4, 2025
@openshift-ci-robot
Copy link

@JoelSpeed: This pull request references Jira Issue OCPBUGS-54426, which is invalid:

  • expected the bug to target the "4.19.0" version, but no target version was set

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.

In response to this:

This has already merged into the main and 1.33 branch of K/K, but we are waiting on cherry-pick approval for the 1.32 branch.

This updates the implementation of the CEL CIDR matching check which was rejecting some valid values.

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

@JoelSpeed: the contents of this pull request could be automatically validated.

The following commits are valid:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci openshift-ci bot requested review from bertinatto and p0lyn0mial April 4, 2025 10:50
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Apr 4, 2025
@JoelSpeed
Copy link
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 4, 2025
@openshift-ci-robot
Copy link

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

Requesting review from QA contact:
/cc @wangke19

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 openshift-ci bot requested a review from wangke19 April 4, 2025 11:37
@JoelSpeed
Copy link
Author

/test integration

@JoelSpeed
Copy link
Author

/retest

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2025
Copy link

openshift-ci bot commented Apr 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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 7, 2025
@JoelSpeed
Copy link
Author

/cherry-pick release-4.18

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.18

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

/retest-required

Remaining retests: 0 against base HEAD c17291b and 2 for PR HEAD 07d437a in total

@JoelSpeed
Copy link
Author

/retest

Copy link

openshift-ci bot commented Apr 8, 2025

@JoelSpeed: all tests passed!

Full PR test history. Your PR dashboard.

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-merge-bot openshift-merge-bot bot merged commit e15f4f8 into openshift:master Apr 8, 2025
22 checks passed
@openshift-ci-robot
Copy link

@JoelSpeed: An error was encountered searching for bug OCPBUGS-54426 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. No response returned: Get "https://issues.redhat.com/rest/api/2/issue/OCPBUGS-54426": GET https://issues.redhat.com/rest/api/2/issue/OCPBUGS-54426 giving up after 5 attempt(s)

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

In response to this:

This has already merged into the main and 1.33 branch of K/K, but we are waiting on cherry-pick approval for the 1.32 branch.

This updates the implementation of the CEL CIDR matching check which was rejecting some valid values.

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-cherrypick-robot

@JoelSpeed: new pull request created: #2267

In response to this:

/cherry-pick release-4.18

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

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-pod
This PR has been included in build openshift-enterprise-pod-container-v4.20.0-202504081610.p0.ge15f4f8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-hyperkube
This PR has been included in build openshift-enterprise-hyperkube-container-v4.20.0-202504081610.p0.ge15f4f8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-kube-apiserver-artifacts
This PR has been included in build ose-installer-kube-apiserver-artifacts-container-v4.20.0-202504081610.p0.ge15f4f8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: kube-proxy
This PR has been included in build kube-proxy-container-v4.20.0-202504081610.p0.ge15f4f8.assembly.stream.el9.
All builds following this will include this PR.

ormergi added a commit to ormergi/cluster-network-operator that referenced this pull request Apr 23, 2025
Add CEL validation to ensure the specified excludeSubnetes match the
specified subnets.

This change make the CRD diverge from the CRD on U/S due to a bug [1]
that its fix is available on D/S [2] [3] but not available on U/S yet.

[1] https://issues.redhat.com/browse/OCPBUGS-54426
[2] openshift/kubernetes#2263
[3] openshift/kubernetes#2267

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/cluster-network-operator that referenced this pull request Apr 23, 2025
Add CEL validation on OVN-K CUDN CRD for localnet to topology, to ensure
the specified excludeSubnetes match the specified subnets.

This change make the CRD diverge from the CRD on U/S due to a bug [1]
that its fix is available on D/S [2] [3] but not available on U/S yet.

[1] https://issues.redhat.com/browse/OCPBUGS-54426
[2] openshift/kubernetes#2263
[3] openshift/kubernetes#2267

Signed-off-by: Or Mergi <[email protected]>
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. backports/validated-commits Indicates that all commits come to merged upstream PRs. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants