[release-4.13] OCPBUGS-33759: FRR: squash advertisements with the same prefix

[fedepaol]

Passing multiple advertisements with the same prefix to the template causes duplicate entries. This happens for example when the shared ip annotation is used with the services.

Since a given advertisement has the related peers as fields, the right place to squash is when we manage the advertisements related to a given neighbor.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fedepaol

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:

• OWNERS [fedepaol]

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

[fedepaol]

/jira cherry-pick OCPBUGS-33365

[openshift-ci-robot]

@fedepaol: Jira Issue OCPBUGS-33365 has been cloned as Jira Issue OCPBUGS-33759. Will retitle bug to link to clone.
/retitle OCPBUGS-33759: FRR: squash advertisements with the same prefix

In response to this:

/jira cherry-pick OCPBUGS-33365

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]

@fedepaol: This pull request references Jira Issue OCPBUGS-33759, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"

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:

Passing multiple advertisements with the same prefix to the template causes duplicate entries. This happens for example when the shared ip annotation is used with the services.

Since a given advertisement has the related peers as fields, the right place to squash is when we manage the advertisements related to a given neighbor.

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.

[fedepaol]

/jira refresh

[openshift-ci-robot]

@fedepaol: This pull request references Jira Issue OCPBUGS-33759, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.13.z) matches configured target version for branch (4.13.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-33365 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-33365 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
• bug has dependents

Requesting review from QA contact:
/cc @asood-rh

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.

[fedepaol]

/label backport-risk-assessed

[cgoncalves]

/lgtm

[zeeke]

/retitle [release-4.13] OCPBUGS-33759: FRR: squash advertisements with the same prefix

[liornoy]

wouldn't we want to test "mismatch IPFamily" as well?

[fedepaol]

I agree, but this is a backport, so we don't normally change the content as it was already reviewed and approved upstream and in the various openshift versions.

[liornoy]

lgtm other than that, didn't notice it's a backport

[openshift-ci]

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

[asood-rh]

/label cherry-pick-approved

[openshift-ci-robot]

@fedepaol: Jira Issue OCPBUGS-33759: All pull requests linked via external trackers have merged:

• openshift/metallb#174

Jira Issue OCPBUGS-33759 has been moved to the MODIFIED state.

In response to this:

Passing multiple advertisements with the same prefix to the template causes duplicate entries. This happens for example when the shared ip annotation is used with the services.

Since a given advertisement has the related peers as fields, the right place to squash is when we manage the advertisements related to a given neighbor.

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.

[fedepaol]

/cherry-pick release-4.12

[openshift-cherrypick-robot]

@fedepaol: #174 failed to apply on top of branch "release-4.12":

Applying: FRR: squash advertisements with the same prefix
.git/rebase-apply/patch:421: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	internal/bgp/frr/frr.go
M	internal/bgp/frr/frr_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/bgp/frr/frr_test.go
Auto-merging internal/bgp/frr/frr.go
CONFLICT (content): Merge conflict in internal/bgp/frr/frr.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 FRR: squash advertisements with the same prefix
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.12

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]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-metallb-container-v4.13.0-202405161336.p0.gc1e873f.assembly.stream.el8 for distgit ose-metallb.
All builds following this will include this PR.