Skip to content

fix(webhook): Force apply the CRD in the CRD maintainer #1116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2025
Merged

fix(webhook): Force apply the CRD in the CRD maintainer #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c46d3d
fix: Force apply the CRD in the CRD maintainer
Techassi Oct 31, 2025
d4bf8a6
chore: Add changelog entry
Techassi Oct 31, 2025
73dfd9c
chore: Apply suggestion
Techassi Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions crates/stackable-webhook/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Fixed

- Force apply the CRD in the CRD maintainer ([#1116]).

This ensures the operator will be the sole manager of the CRD (and all its fields) going forward.
This avoids running into conflicts when CRDs were previously deployed by helm or stackablectl.

[#1116]: https://github.com/stackabletech/operator-rs/pull/1116

## [0.7.0] - 2025-10-16

### Added
Expand Down
22 changes: 21 additions & 1 deletion crates/stackable-webhook/src/maintainer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,27 @@ impl<'a> CustomResourceDefinitionMaintainer<'a> {

// Deploy the updated CRDs using a server-side apply.
let patch = Patch::Apply(&crd);
let patch_params = PatchParams::apply(field_manager);

// We force apply here, because we want to become the sole manager of the CRD. This
// avoids any conflicts from previous deployments via helm or stackablectl which are
// reported with the following error message:
//
// Apply failed with 2 conflicts: conflicts with "stackablectl" using apiextensions.k8s.io/v1:
// - .spec.versions
// - .spec.conversion.strategy: Conflict
//
// The official Kubernetes documentation provides three options on how to solve
// these conflicts. Option 1 is used, which is described as follows:
//
// Overwrite value, become sole manager: If overwriting the value was intentional
// (or if the applier is an automated process like a controller) the applier should
// set the force query parameter to true [...], and make the request again. This
// forces the operation to succeed, changes the value of the field, and removes the
// field from all other managers' entries in managedFields.
//
// See https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
let patch_params = PatchParams::apply(field_manager).force();

crd_api
.patch(&crd_name, &patch_params, &patch)
.await
Expand Down