OCPBUGS-105556: [4.22] frr-k8s: use Recreate strategy for statuscleaner deployment by oribon · Pull Request #3116 · openshift/cluster-network-operator

oribon · 2026-08-11T09:25:40Z

A NOT clean cherry-pick of #3104
differences:

1st commit needed for unit tests, semi-clean: dropped definiton of mustFindContainer and findExecCommand (otherwise lint fails)
2nd commit is semi clean , added bootstrap result wiring to additionalRoutingCapibilities (that was already there for 5.0), aligned existing unit test with fakeBootstrapResult() as in 5.0

openshift-merge-bot · 2026-08-11T09:25:43Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci-robot · 2026-08-11T09:25:47Z

@oribon: This pull request references Jira Issue OCPBUGS-105556, 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". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-105556 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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:

A NOT clean cherry-pick of #3104
differences:

1st commit needed for unit tests (clean)

2nd commit is semi clean , added bootstrap result wiring to additionalRoutingCapibilities (that was already there for 5.0), aligned existing unit test with fakeBootstrapResult() as in 5.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.

coderabbitai · 2026-08-11T09:25:50Z

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: c81012e3-9544-4ad5-859b-bd23cf3db045

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

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

oribon · 2026-08-11T09:27:47Z

/jira refresh

openshift-ci-robot · 2026-08-11T09:27:55Z

@oribon: This pull request references Jira Issue OCPBUGS-105556, 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.22.0) matches configured target version for branch (4.22.0)
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-64582 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-64582 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

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

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.

This commit adds helper functions to testutil_test.go that are used by component rendering tests to verify rendered Kubernetes objects: - mustFindRenderedObj: Finds and converts unstructured objects using generics - mustFindContainer: Finds a container by name in a container list - findExecCommand: Extracts exec command strings from container command args These utilities facilitate testing of rendered manifests and container configurations across multiple components. Signed-off-by: Tom Pantelis <tompantelis@gmail.com> (cherry picked from commit c617131)

The statuscleaner deployment uses hostNetwork with a fixed port (9123). With the default RollingUpdate strategy, upgrades on SNO clusters get stuck because the new pod cannot bind the host port already held by the old pod. Switching to Recreate ensures the old pod is terminated before the new one starts. Signed-off-by: Federico Paolinelli <fpaoline@redhat.com> Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> (cherry picked from commit 3d86b75)

openshift-ci-robot · 2026-08-11T09:31:25Z

@oribon: This pull request references Jira Issue OCPBUGS-105556, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
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-64582 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-64582 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

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

Details

In response to this:

A NOT clean cherry-pick of #3104
differences:

1st commit needed for unit tests, semi-clean: dropped definiton of mustFindContainer and findExecCommand (otherwise lint fails)

2nd commit is semi clean , added bootstrap result wiring to additionalRoutingCapibilities (that was already there for 5.0), aligned existing unit test with fakeBootstrapResult() as in 5.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.

oribon · 2026-08-11T09:32:34Z

/verified later @jechen0648

openshift-ci-robot · 2026-08-11T09:32:47Z

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

Details

In response to this:

/verified later @jechen0648

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.

andreaskaris · 2026-08-13T15:19:38Z

/lgtm

openshift-ci · 2026-08-13T15:21:36Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: andreaskaris, oribon
Once this PR has been reviewed and has the lgtm label, please assign knobunc 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:

OWNERS

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

openshift-merge-bot · 2026-08-13T15:21:47Z

Scheduling required tests:
/test e2e-aws-ovn-upgrade-ipsec

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test frrk8s-e2e
/test 4.22-upgrade-from-stable-4.21-e2e-aws-ovn-upgrade
/test 4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade
/test 4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-upgrade
/test e2e-aws-ovn-fdp-qe
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-windows
/test e2e-azure-ovn-upgrade
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-dualstack-bgp
/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw
/test e2e-metal-ipi-ovn-ipv6
/test e2e-metal-ipi-ovn-ipv6-ipsec
/test e2e-ovn-ipsec-step-registry
/test hypershift-e2e-aks

openshift-ci · 2026-08-13T20:49:50Z

@oribon: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/security	`aad8bfc`	link	false	`/test security`
ci/prow/e2e-azure-ovn-upgrade	`aad8bfc`	link	true	`/test e2e-azure-ovn-upgrade`
ci/prow/hypershift-e2e-aks	`aad8bfc`	link	true	`/test hypershift-e2e-aks`
ci/prow/4.22-upgrade-from-stable-4.21-e2e-aws-ovn-upgrade	`aad8bfc`	link	false	`/test 4.22-upgrade-from-stable-4.21-e2e-aws-ovn-upgrade`
ci/prow/e2e-metal-ipi-ovn-dualstack-bgp	`aad8bfc`	link	true	`/test e2e-metal-ipi-ovn-dualstack-bgp`
ci/prow/e2e-aws-ovn-fdp-qe	`aad8bfc`	link	true	`/test e2e-aws-ovn-fdp-qe`
ci/prow/4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-upgrade	`aad8bfc`	link	false	`/test 4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-upgrade`
ci/prow/4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade	`aad8bfc`	link	false	`/test 4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade`

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.

oribon · 2026-08-16T10:38:56Z

/hold

oribon · 2026-08-18T13:15:03Z

#3121 needs to reach 5.0, and then the commit from there merged with the commits here for 4.22 downwards
cc @andreaskaris

openshift-ci-robot · 2026-08-18T13:15:07Z

@oribon: This pull request references Jira Issue OCPBUGS-105556. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

A NOT clean cherry-pick of #3104
differences:

1st commit needed for unit tests, semi-clean: dropped definiton of mustFindContainer and findExecCommand (otherwise lint fails)

2nd commit is semi clean , added bootstrap result wiring to additionalRoutingCapibilities (that was already there for 5.0), aligned existing unit test with fakeBootstrapResult() as in 5.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 Bot requested review from bpickard22 and mattedallo August 11, 2026 09:27

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 Aug 11, 2026

tpantelis and others added 2 commits August 11, 2026 12:30

oribon force-pushed the frrk8swebhooksno branch from 4b976b9 to aad8bfc Compare August 11, 2026 09:30

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Aug 11, 2026

openshift-ci Bot assigned andreaskaris Aug 13, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 13, 2026

oribon mentioned this pull request Aug 16, 2026

OCPBUGS-64582: Drop strategy.rollingUpdate and switch strategy.type to Recreate via pre-patch in frr-k8s-statuscleaner deployments on SNO #3121

Merged

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 16, 2026

oribon closed this Aug 18, 2026

andreaskaris mentioned this pull request Aug 20, 2026

OCPBUGS-105556: [4.22] frr-k8s: use Recreate strategy for statuscleaner deployment #3130

Merged

Uh oh!

Conversation

oribon commented Aug 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-merge-bot Bot commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

coderabbitai Bot commented Aug 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

oribon commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

oribon commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

andreaskaris commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

oribon commented Aug 16, 2026

Uh oh!

oribon commented Aug 18, 2026

Uh oh!

openshift-ci-robot commented Aug 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

oribon commented Aug 11, 2026 •

edited

Loading

coderabbitai Bot commented Aug 11, 2026 •

edited

Loading