✨ Addons: Add functionality for resolveConflicts: PRESERVE #5330

edmondceausu · 2025-02-03T18:30:48Z

What type of PR is this?
/kind feature

What this PR does / why we need it:

Added support for resolveConflicts.PRESERVE (API Reference). This is helpful if users are migrating an existing cluster to Cluster API and do not have their existing Addon Configs specified, or if an out of band change is made to an Addon (eg. configMap change) and the user wants to preserve it.

The schema for conflictResolution had listed none as the default behavior. I updated the docs and code to reflect that.
*
Special notes for your reviewer*:

Checklist:

Release note:

NONE

linux-foundation-easycla · 2025-02-03T18:30:54Z

The committers listed above are authorized under a signed CLA.

✅ login: edmondceausu / name: Edmond Ceausu (6fa65e9, 5770682, 03e41e1, e9c5022, 738123f)

k8s-ci-robot · 2025-02-03T18:30:57Z

Welcome @edmondceausu!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-02-03T18:30:58Z

Hi @edmondceausu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

nrb · 2025-02-04T21:16:34Z

/ok-to-test

nrb · 2025-02-04T21:38:19Z

Thanks for this!

Overall, this looks good to me. The tests are currently failing because make generate needs to be run and the results committed, and it looks like the linter's finding an unnecessary newline.

Once those are fixed (and it passes e2es), I think we're good!

edmondceausu · 2025-02-17T15:16:08Z

/retest

edmondceausu · 2025-03-24T17:55:38Z

/test pull-cluster-api-provider-aws-test

richardcase · 2025-04-04T14:07:42Z

/test pull-cluster-api-provider-aws-e2e

richardcase

Thanks for this @edmondceausu . Just the one small comment.

controlplane/eks/api/v1beta1/types.go

edmondceausu · 2025-04-07T01:49:51Z

/test pull-cluster-api-provider-aws-e2e

damdo · 2025-04-10T08:53:31Z

/test pull-cluster-api-provider-aws-e2e

richardcase · 2025-04-13T15:54:01Z

/test ?

edmondceausu · 2025-06-17T02:29:47Z

@damdo code has been rebased. Apologies for the delay.

damdo

Thanks

/lgtm

/assign @richardcase @nrb @AndiDog

k8s-ci-robot · 2025-06-17T08:56:25Z

LGTM label has been added.

Git tree hash: 67a9048a28dc02ac811bb4bb8ed38d116c7c8a44

kemv · 2025-08-06T08:01:41Z

This would fix #5524 🎉

edmondceausu · 2025-08-06T11:30:16Z

@AndiDog what do I need to do to get this merged?

nrb · 2025-08-06T17:59:41Z

/approve

@edmondceausu Thank you for your patience!

k8s-ci-robot · 2025-08-06T17:59:50Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [nrb]

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

fixes for test to pass removed v1beta1 support

damdo · 2025-08-07T16:24:43Z

/test pull-cluster-api-provider-aws-e2e-blocking

damdo

/lgtm

k8s-ci-robot · 2025-08-07T16:25:11Z

LGTM label has been added.

Git tree hash: 4e49ac1edd5756335888c8ed245ee09ad2efbc03

…s-sigs#5330) * Add functionality for resolveConflicts: PRESERVE fixes for test to pass removed v1beta1 support * make generate * updated documentation and code to reflect kubebuilder behavior * fixed rebase errors * make generate after rebase

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 3, 2025

k8s-ci-robot added the needs-priority label Feb 3, 2025

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 3, 2025

k8s-ci-robot requested review from damdo and fiunchinho February 3, 2025 18:31

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 3, 2025

edmondceausu changed the title ~~Addons: Add functionality for resolveConflicts: PRESERVE~~ ✨ Addons: Add functionality for resolveConflicts: PRESERVE Feb 3, 2025

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 4, 2025

edmondceausu force-pushed the addons-preserve branch from b599143 to ef40f66 Compare February 4, 2025 21:21

richardcase reviewed Apr 4, 2025

View reviewed changes

controlplane/eks/api/v1beta1/types.go Outdated Show resolved Hide resolved

edmondceausu force-pushed the addons-preserve branch 2 times, most recently from 924b7be to 925b5d4 Compare April 6, 2025 18:49

k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 13, 2025

k8s-ci-robot requested review from nrb and richardcase June 16, 2025 10:51

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 16, 2025

damdo reviewed Jun 17, 2025

View reviewed changes

k8s-ci-robot assigned AndiDog Jun 17, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 17, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2025

Edmond Ceausu added 4 commits August 6, 2025 20:26

Add functionality for resolveConflicts: PRESERVE

03e41e1

fixes for test to pass removed v1beta1 support

make generate

6fa65e9

updated documentation and code to reflect kubebuilder behavior

5770682

fixed rebase errors

738123f

edmondceausu force-pushed the addons-preserve branch from 632280c to 738123f Compare August 6, 2025 20:27

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 6, 2025

k8s-ci-robot requested review from AndiDog and damdo August 6, 2025 20:27

make generate after rebase

e9c5022

damdo reviewed Aug 7, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 7, 2025

k8s-ci-robot merged commit 4df1908 into kubernetes-sigs:main Aug 7, 2025
17 checks passed

k8s-ci-robot added this to the v2.8 milestone Aug 7, 2025

damdo mentioned this pull request Aug 29, 2025

Support PRESERVE in Addon conflictResolution #5524

Closed

✨ Addons: Add functionality for resolveConflicts: PRESERVE #5330

✨ Addons: Add functionality for resolveConflicts: PRESERVE #5330

Uh oh!

Conversation

edmondceausu commented Feb 3, 2025 • edited by richardcase Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

linux-foundation-easycla bot commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Feb 3, 2025

Uh oh!

k8s-ci-robot commented Feb 3, 2025

Uh oh!

nrb commented Feb 4, 2025

Uh oh!

nrb commented Feb 4, 2025

Uh oh!

edmondceausu commented Feb 17, 2025

Uh oh!

edmondceausu commented Mar 24, 2025

Uh oh!

richardcase commented Apr 4, 2025

Uh oh!

richardcase left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

edmondceausu commented Apr 7, 2025

Uh oh!

damdo commented Apr 10, 2025

Uh oh!

richardcase commented Apr 13, 2025

Uh oh!

edmondceausu commented Jun 17, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Jun 17, 2025

Uh oh!

kemv commented Aug 6, 2025

Uh oh!

edmondceausu commented Aug 6, 2025

Uh oh!

nrb commented Aug 6, 2025

Uh oh!

k8s-ci-robot commented Aug 6, 2025

Uh oh!

damdo commented Aug 7, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Aug 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

edmondceausu commented Feb 3, 2025 •

edited by richardcase

Loading

linux-foundation-easycla bot commented Feb 3, 2025 •

edited

Loading