OCPBUGS-112789: [4.21] frr-k8s: use Recreate strategy for statuscleaner deployment by andreaskaris · Pull Request #3135 · openshift/cluster-network-operator

andreaskaris · 2026-08-24T09:15:24Z

Mainly clean cherry-pick of all commits from #3130.

Manual changes:

One minor conflict when cherry-picking frr-k8s: use Recreate strategy for statuscleaner deployment where git did not know what to do with the presence of function isSupportedDualStackPlatform which is present in 4.21 just before renderAdditionalRotuingCapabilities:

func isSupportedDualStackPlatform(platformType configv1.PlatformType) bool {
	return dualStackPlatforms.Has(string(platformType))
}

func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapResult, manifestDir string) ([]*uns.Unstructured, error) {
(...)

needed to change context.Background() to t.Context() when cherry-picking apply: add unit tests for PrePatchAnnotation and replace fakeRESTMapper

openshift-merge-bot · 2026-08-24T09:15:28Z

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

coderabbitai · 2026-08-24T09:15:34Z

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: Enterprise

Run ID: 43262525-e36e-4719-b175-b55bd72e1e1f

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

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

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> Co-Authored-By: Ori Braunshtein <obraunsh@redhat.com> (cherry picked from commit c617131) Cherry-pick not clean: - dropped definiton of mustFindContainer and findExecCommand (otherwise lint fails) (cherry picked from commit cedf0d7)

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: Ori Braunshtein <obraunsh@redhat.com> Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> (cherry picked from commit 3d86b75) Cherry-pick not clean: - added bootstrap result wiring to additionalRoutingCapibilities (that was already there for 5.0), aligned existing unit test with fakeBootstrapResult() as in 5.0 (cherry picked from commit a5752d9) Conflicts: pkg/network/render.go preserving Very small conflict due to the presence of isSupportedDualStackPlatform. Resolution: keep isSupportedDualStackPlatform + add bootstrapResult to renderAdditionalRoutingCapabilities.

On upgrade, the frr-k8s-statuscleaner Deployment has rollingUpdate fields defaulted by the API server. SSA cannot remove fields it does not own, so switching strategy.type to Recreate fails with: spec.strategy.rollingUpdate: Forbidden: may not be specified when strategy `type` is 'Recreate' Add a generic pre-patch annotation: networkoperator.openshift.io/pre-patch that applies a strategic-merge-patch to the live object before SSA. This lets the template atomically set type=Recreate and remove rollingUpdate in a single patch, before SSA takes over. Also explicitly set strategy to RollingUpdate with rollingUpdate fields on non-SNO clusters so that CNO owns these fields going forward, preventing the issue from recurring in case we have to make the same switch for non-SNO clusters in the future. Signed-off-by: Andreas Karis <ak.karis@gmail.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit 8ebb78e) (cherry picked from commit d59aba6)

Add tests for ApplyObject's pre-patch behavior: strategic-merge-patch runs before SSA, NotFound is tolerated, other errors stop reconciliation, and objects without the annotation skip pre-patch entirely. Remove fakeRESTMapper and replace it with testrestmapper.TetsOnlyStaticRESTMapper to return a proper mapper, and return scheme.Scheme from Scheme(). Both changes needed by ApplyObject under test. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Andreas Karis <ak.karis@gmail.com> (cherry picked from commit 6ca59b1) (cherry picked from commit b1775c9) Not clean cherry-pick: Make the linter happy by applying the changes to pkg/apply from openshift#3138. See that PR for further details.

jechen0648 · 2026-08-24T16:06:12Z

/verified by pre-merge testing by @jechen0648

openshift-ci-robot · 2026-08-24T16:06:25Z

@jechen0648: This PR has been marked as verified by pre-merge testing by @jechen0648.

Details

In response to this:

/verified by pre-merge testing by @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-24T16:12:41Z

/pipeline required

openshift-merge-bot · 2026-08-24T16:12:44Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test frrk8s-e2e
/test 4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
/test 4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
/test 4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-upgrade
/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-upgrade-ipsec
/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-robot · 2026-08-24T16:17:56Z

@andreaskaris: This pull request references Jira Issue OCPBUGS-112789, which is invalid:

expected the bug to target either version "4.21.z." or "openshift-4.21.z.", but it targets "4.22.z" 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:

Mainly clean cherry-pick of all commits from #3130.

Manual changes:

One minor conflict when cherry-picking frr-k8s: use Recreate strategy for statuscleaner deployment where git did not know what to do with the presence of function isSupportedDualStackPlatform which is present in 4.21 just before renderAdditionalRotuingCapabilities:
func isSupportedDualStackPlatform(platformType configv1.PlatformType) bool {
  return dualStackPlatforms.Has(string(platformType))
}

func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapResult, manifestDir string) ([]*uns.Unstructured, error) {
(...)
needed to change context.Background() to t.Context() when cherry-picking apply: add unit tests for PrePatchAnnotation and replace fakeRESTMapper

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-24T16:18:35Z

/jira refresh

openshift-ci-robot · 2026-08-24T16:18:41Z

@andreaskaris: This pull request references Jira Issue OCPBUGS-112789, 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 type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-105556 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-105556 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 (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.

andreaskaris · 2026-08-25T09:43:20Z

/retest

jcaamano · 2026-08-25T12:14:07Z

/lgtm
/approve
/label backport-risk-assessed

openshift-merge-bot · 2026-08-25T12:21:28Z

Tests from second stage were triggered manually. Pipeline can be controlled only manually, until HEAD changes. Use command to trigger second stage.

openshift-ci · 2026-08-25T12:23:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreaskaris, jcaamano

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~~ [jcaamano]

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

andreaskaris · 2026-08-25T14:45:31Z

/retest-required

openshift-ci · 2026-08-25T18:06:27Z

@andreaskaris: 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/4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade	`216d5c2`	link	false	`/test 4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade`
ci/prow/security	`216d5c2`	link	false	`/test security`
ci/prow/frrk8s-e2e	`216d5c2`	link	false	`/test frrk8s-e2e`
ci/prow/4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade	`216d5c2`	link	false	`/test 4.21-upgrade-from-stable-4.20-e2e-aws-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.

openshift-ci-robot · 2026-08-25T18:14:34Z

@andreaskaris: Jira Issue Verification Checks: Jira Issue OCPBUGS-112789
✔️ 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-112789 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:

Mainly clean cherry-pick of all commits from #3130.

Manual changes:

One minor conflict when cherry-picking frr-k8s: use Recreate strategy for statuscleaner deployment where git did not know what to do with the presence of function isSupportedDualStackPlatform which is present in 4.21 just before renderAdditionalRotuingCapabilities:
func isSupportedDualStackPlatform(platformType configv1.PlatformType) bool {
  return dualStackPlatforms.Has(string(platformType))
}

func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapResult, manifestDir string) ([]*uns.Unstructured, error) {
(...)
needed to change context.Background() to t.Context() when cherry-picking apply: add unit tests for PrePatchAnnotation and replace fakeRESTMapper

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-25T19:06:31Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2026-08-25T19:07:17Z

@andreaskaris: new pull request created: #3140

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.

openshift-ci Bot requested review from arkadeepsen and tssurya August 24, 2026 09:16

tpantelis and others added 4 commits August 24, 2026 17:57

andreaskaris force-pushed the OCPBUGS-112789 branch from 9098467 to 216d5c2 Compare August 24, 2026 15:58

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 24, 2026

andreaskaris changed the title ~~Ocpbugs 112789~~ OCPBUGS-112789: [4.21] frr-k8s: use Recreate strategy for statuscleaner deployment Aug 24, 2026

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 24, 2026

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 25, 2026

openshift-ci Bot assigned jcaamano Aug 25, 2026

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

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2026

openshift-merge-bot Bot merged commit d1d5e0e into openshift:release-4.21 Aug 25, 2026
25 of 29 checks passed

openshift-cherrypick-robot mentioned this pull request Aug 25, 2026

[release-4.20] OCPBUGS-113989: [4.21] frr-k8s: use Recreate strategy for statuscleaner deployment #3140

Closed

jechen0648 mentioned this pull request Aug 25, 2026

[release-4.20] OCPBUGS-113989: frr-k8s: use Recreate strategy for webhook server deployment on SNO #3141

Closed

andreaskaris mentioned this pull request Aug 26, 2026

[release-4.20] OCPBUGS-113989: frr-k8s: use Recreate strategy for webhook server deployment on SNO #3142

Merged

Uh oh!

Conversation

andreaskaris commented Aug 24, 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 24, 2026

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

jechen0648 commented Aug 24, 2026

Uh oh!

openshift-ci-robot commented Aug 24, 2026

Uh oh!

andreaskaris commented Aug 24, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 24, 2026

Uh oh!

openshift-ci-robot commented Aug 24, 2026

Uh oh!

andreaskaris commented Aug 24, 2026

Uh oh!

openshift-ci-robot commented Aug 24, 2026

Uh oh!

andreaskaris commented Aug 25, 2026

Uh oh!

jcaamano commented Aug 25, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 25, 2026

Uh oh!

openshift-ci Bot commented Aug 25, 2026

Uh oh!

andreaskaris commented Aug 25, 2026

Uh oh!

openshift-ci Bot commented Aug 25, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 25, 2026

Uh oh!

andreaskaris commented Aug 25, 2026

Uh oh!

openshift-cherrypick-robot commented Aug 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

andreaskaris commented Aug 24, 2026 •

edited

Loading

coderabbitai Bot commented Aug 24, 2026 •

edited

Loading