Skip to content

feat: add SSA field manager migration options #23337

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
Merged
merged 10 commits into from
Jun 13, 2025
Merged

feat: add SSA field manager migration options #23337

merged 10 commits into from
Jun 13, 2025

Conversation

pjiang-dev
Copy link
Contributor

@pjiang-dev pjiang-dev commented Jun 9, 2025 •
edited
Loading

fixes #23214
gitops-engine PR: argoproj/gitops-engine#727 - This needs to be merged first

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Jun 9, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@pjiang-dev pjiang-dev marked this pull request as ready for review June 11, 2025 20:52
@pjiang-dev pjiang-dev requested a review from a team as a code owner June 11, 2025 20:52
@blakepettersson blakepettersson mentioned this pull request Jun 12, 2025
Open
3 tasks
leoluz
leoluz requested changes Jun 12, 2025
View reviewed changes
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add documentation about the following:

Technical doc about:
The new sync option
The feature flag

User/Migration doc about describing about the feature, why it is needed and how to use it. We could add a reference to kubernetes doc too: https://github.com/alexzielenski/enhancements/blob/03df8820b9feca6d2cab78e303c99b2[…]keps/sig-cli/3517-kubectl-client-side-apply-migration/README.md

@pjiang-dev pjiang-dev requested a review from a team as a code owner June 12, 2025 23:51
@pjiang-dev pjiang-dev requested a review from leoluz June 13, 2025 00:04
@pjiang-dev
feat: add SSA field manager migration options
fb8f8fb 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
Add sync op
e3ca2ac 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
point to gitops fork
c83e142 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
Point to gitops-engine latest
4e4107b 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
Add docs
b23aadd 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
add test for new sync option
f2126fe 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
add test for new sync option
535a121 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev
update gitops-engine
1d5a48a 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev pjiang-dev force-pushed the pjiang/SSA-CSA-migration branch from b0570d1 to 1d5a48a Compare June 13, 2025 17:16
@pjiang-dev
Update sync_test.go
4ecdc7e 
Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
@codecov Codecov
Copy link

codecov bot commented Jun 13, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@1df47e9). Learn more about missing BASE report.
Report is 18 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #23337   +/-   ##
=========================================
  Coverage          ?   60.08%           
=========================================
  Files             ?      342           
  Lines             ?    58814           
  Branches          ?        0           
=========================================
  Hits              ?    35337           
  Misses            ?    20612           
  Partials          ?     2865

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

leoluz
leoluz requested changes Jun 13, 2025
View reviewed changes
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check my comments.

@pjiang-dev
Update docs
f840674 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
leoluz
leoluz approved these changes Jun 13, 2025
View reviewed changes
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@leoluz leoluz enabled auto-merge (squash) June 13, 2025 21:23
@leoluz leoluz merged commit dc1d148 into argoproj:master Jun 13, 2025
27 checks passed
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@pjiang-dev @dsuhinin
feat: add SSA field manager migration options (argoproj#23337)
5aaddd5 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
jcogilvie pushed a commit to Sanyaku/argo-cd that referenced this pull request Jun 16, 2025
@pjiang-dev @jcogilvie
feat: add SSA field manager migration options (argoproj#23337)
ce159e5 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
Signed-off-by: Jonathan Ogilvie <jonathan.ogilvie@sumologic.com>
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
@pjiang-dev @enneitex
feat: add SSA field manager migration options (argoproj#23337)
9f85237 
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
Signed-off-by: enneitex <etienne.divet@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leoluz leoluz leoluz approved these changes

Assignees
No one assigned
Labels
for-release-blog-3-1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Server-Side Apply prevents field deletion owned by other managers
3 participants
@pjiang-dev @leoluz @agaudreault