Skip to content
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

Jump to bottom

feat: Preserve user-managed fields when applying resources #556

Merged
merged 3 commits into from
Apr 25, 2024
Merged

feat: Preserve user-managed fields when applying resources #556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
063a12f
feat: Preserve user-managed fields when applying resources
dlipovetsky Apr 23, 2024
4ed2369
fixup! feat: Preserve user-managed fields when applying resources
dlipovetsky Apr 25, 2024
46880bf
fixup! feat: Preserve user-managed fields when applying resources
dlipovetsky Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions common/pkg/k8s/client/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

// ServerSideApply will apply (i.e. create or update) objects via server-side apply. This will overwrite any changes
// that have been manually applied.
// that have been manually applied to fields managed by CAREN.
func ServerSideApply(
ctx context.Context,
c ctrlclient.Client,
Expand All @@ -22,7 +22,6 @@ func ServerSideApply(
ctx,
objs[i],
ctrlclient.Apply,
ctrlclient.ForceOwnership,
dlipovetsky marked this conversation as resolved.
Show resolved Hide resolved
ctrlclient.FieldOwner("d2iq-cluster-api-runtime-extensions-nutanix"),
)
if err != nil {
Expand Down