Skip to content

Switch to server-side apply for kubectl install/deploy commands - #1895

Merged
openshift-merge-bot[bot] merged 1 commit into
rh-ecosystem-edge:mainfrom
TomerNewman:server-side
Sep 3, 2026
Merged

Switch to server-side apply for kubectl install/deploy commands#1895
openshift-merge-bot[bot] merged 1 commit into
rh-ecosystem-edge:mainfrom
TomerNewman:server-side

Conversation

@TomerNewman

@TomerNewman TomerNewman commented Sep 1, 2026

Copy link
Copy Markdown
Member

Client-side apply stores the full manifest in the
last-applied-configuration annotation, capped at 256KB. The Module and ManagedClusterModule CRDs haven't hit that limit yet, but the pending configurable SecurityContext change (#1323) will push them over it and break kubectl apply.
Switch to --server-side --force-conflicts preemptively, since it tracks field
ownership on the API server instead and isn't subject to this limit.


/cc @yevgeny-shnaidman @ybettan
fix #1893

Summary by CodeRabbit

  • Improvements
    • Installation and deployment commands now use server-side application with forced conflict resolution.
    • Updated setup documentation with the revised commands for standard and hub installations.
    • Improves reliability when applying configurations that contain conflicting changes.

Client-side apply stores the full manifest in the
last-applied-configuration annotation, capped at 256KB. The Module and
ManagedClusterModule CRDs haven't hit that limit yet, but the pending
configurable SecurityContext change (rh-ecosystem-edge#1323) will push
them over it and break kubectl apply.
 Switch to --server-side --force-conflicts preemptively, since it tracks field
ownership on the API server instead and isn't subject to this limit.
@netlify

netlify Bot commented Sep 1, 2026

Copy link
Copy Markdown

Deploy Preview for openshift-kmm ready!

Name Link
🔨 Latest commit 5d1210b
🔍 Latest deploy log https://app.netlify.com/projects/openshift-kmm/deploys/6a9670f395c61f00086227cf
😎 Deploy Preview https://deploy-preview-1895--openshift-kmm.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomerNewman

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:

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 label Sep 1, 2026
@coderabbitai

coderabbitai Bot commented Sep 1, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: fbe1a2af-aba4-40dd-987b-450d8b6a2104

📥 Commits

Reviewing files that changed from the base of the PR and between 9c2dbd0 and 5d1210b.

📒 Files selected for processing (4)
  • Makefile
  • README.md
  • docs/mkdocs/documentation/hub_spoke.md
  • docs/mkdocs/documentation/install.md

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.


Walkthrough

The change updates Makefile installation targets and documented installation commands to use oc apply --server-side --force-conflicts.

Changes

Server-side apply

Layer / File(s) Summary
Make target apply options
Makefile
The install, deploy, and deploy-hub targets use server-side apply with forced conflict resolution.
Installation documentation commands
README.md, docs/mkdocs/documentation/hub_spoke.md, docs/mkdocs/documentation/install.md
Documented oc apply commands use the same server-side apply options.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Merge Risk: ⚪ Minimal · up to 5d121

The PR updates installation and deployment commands to use server-side apply with forced conflict resolution and aligns the documentation. No actionable merge-blocking risk remains beyond normal checks and review.

Suggested reviewers: ybettan, yevgeny-shnaidman

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the switch to server-side apply for installation and deployment commands. The repository uses oc commands rather than kubectl, but the title still accurately describes …
Linked Issues check ✅ Passed The pull request manually applies the requested server-side apply change from issue #1893. It adds --server-side --force-conflicts to the Makefile targets and installation documentation commands.
Out of Scope Changes check ✅ Passed All modified files support the linked issue. The changes only update install and deploy commands and their documentation to use server-side apply.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Full details: Title check

Explanation

The title clearly describes the switch to server-side apply for installation and deployment commands. The repository uses oc commands rather than kubectl, but the title still accurately describes the primary change.

Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files. (4 skipped: 4 unsupported.)

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

@yevgeny-shnaidman

Copy link
Copy Markdown
Member

/lgtm

@TomerNewman

Copy link
Copy Markdown
Member Author

/retest

4 similar comments
@TomerNewman

Copy link
Copy Markdown
Member Author

/retest

@TomerNewman

Copy link
Copy Markdown
Member Author

/retest

@TomerNewman

Copy link
Copy Markdown
Member Author

/retest

@TomerNewman

Copy link
Copy Markdown
Member Author

/retest

@openshift-merge-bot
openshift-merge-bot Bot merged commit b3c8624 into rh-ecosystem-edge:main Sep 3, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cherry-picking error for 0b4ce24b9411d329a8a0e512501cef759e4d1431

2 participants