cluster-api-provider-aws icon indicating copy to clipboard operation
cluster-api-provider-aws copied to clipboard

Published 20 hours ago • verified publisher icon kubernetes-sigs

:sparkles: Addons: Add functionality for resolveConflicts: PRESERVE

Open edmondceausu opened this issue 9 months ago • 28 comments
trafficstars

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:

  • [ ] squashed commits
  • [ ] includes documentation
  • [ ] includes emoji in title
  • [ ] adds unit tests
  • [ ] adds or updates e2e tests

Release note:

NONE

edmondceausu avatar Feb 03 '25 18:02 edmondceausu