OCPBUGS-111096: Add --frrk8s-secret-passthrough for external frr-k8s

[oribon]

semi-clean cherry-pick from #294

[openshift-ci-robot]

@oribon: This pull request references Jira Issue OCPBUGS-111096, 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-98717 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-98717 targets the "4.22.z" version, which is one of the valid target versions: 4.22.0
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (gkopels@redhat.com), skipping review request.

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

Details

In response to this:

semi-clean cherry-pick from #294

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.

[coderabbitai]

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: a33e4de6-5e12-4856-83fd-c9b266fca713

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oribon

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 [oribon]

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

[openshift-ci]

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

[karampok]

/lgtm

[oribon]

/verified later @gkopels
/label backport-risk-assessed

[openshift-ci-robot]

@oribon: This PR has been marked to be verified later by @gkopels.

Details

In response to this:

/verified later @gkopels
/label backport-risk-assessed

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]

@oribon: Jira Issue OCPBUGS-111096: All pull requests linked via external trackers have merged:

• openshift/metallb#294
• openshift/metallb-operator#334
• openshift/metallb#297
• openshift/metallb-operator#339

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-111096 has been moved to the MODIFIED state.

Details

In response to this:

semi-clean cherry-pick from #294

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.

[oribon]

/cherry-pick release-4.20

[openshift-cherrypick-robot]

@oribon: #297 failed to apply on top of branch "release-4.20":

Applying: Add --frrk8s-secret-passthrough for external frr-k8s
Using index info to reconstruct a base tree...
M	charts/metallb/README.md
M	charts/metallb/templates/speaker.yaml
M	charts/metallb/values.yaml
M	internal/k8s/controllers/config_controller.go
M	internal/k8s/controllers/config_controller_test.go
M	internal/k8s/controllers/pool_controller.go
M	internal/k8s/controllers/pool_controller_test.go
M	internal/k8s/k8s.go
Falling back to patching base and 3-way merge...
Auto-merging charts/metallb/README.md
Auto-merging charts/metallb/templates/speaker.yaml
Auto-merging charts/metallb/values.yaml
Auto-merging internal/k8s/controllers/config_controller.go
CONFLICT (content): Merge conflict in internal/k8s/controllers/config_controller.go
Auto-merging internal/k8s/controllers/config_controller_test.go
CONFLICT (content): Merge conflict in internal/k8s/controllers/config_controller_test.go
Auto-merging internal/k8s/controllers/pool_controller.go
Auto-merging internal/k8s/controllers/pool_controller_test.go
CONFLICT (content): Merge conflict in internal/k8s/controllers/pool_controller_test.go
Auto-merging internal/k8s/k8s.go
CONFLICT (content): Merge conflict in internal/k8s/k8s.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Add --frrk8s-secret-passthrough for external frr-k8s

Details

In response to this:

/cherry-pick release-4.20

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.