fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. #21694

ashutosh16 · 2025-01-28T17:48:26Z

argocd admin import fails occasionally due to resourceVersion mismatch
add flags
- --override-on-conflict // when flag is added the resource will be forcefully updated.
- --skip-resources-with-label //skip certain resources based on the labels
```
--skip-resources-with-label my-label/example.io=true
```

bunnyshell · 2025-01-28T17:48:35Z

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

🚀 /bns:deploy to deploy the environment

cmd/argocd/commands/admin/backup.go

codecov · 2025-01-30T22:30:59Z

Codecov Report

Attention: Patch coverage is 27.27273% with 24 lines in your changes missing coverage. Please review.

Project coverage is 53.71%. Comparing base (1698370) to head (ef0fdea).
Report is 29 commits behind head on master.

Files with missing lines	Patch %	Lines
cmd/argocd/commands/admin/backup.go	27.27%	24 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #21694      +/-   ##
==========================================
- Coverage   55.41%   53.71%   -1.71%     
==========================================
  Files         339      339              
  Lines       57200    56836     -364     
==========================================
- Hits        31700    30528    -1172     
- Misses      22829    23699     +870     
+ Partials     2671     2609      -62

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

agaudreault

Lgtm. Few nitpicks and if you could update the PR description to reflect the changes that would be awesome

cmd/argocd/commands/admin/backup.go

Signed-off-by: asingh51 <[email protected]>

Signed-off-by: asingh51 <[email protected]> fix: resource update when conflict Signed-off-by: asingh51 <[email protected]> fix: resource update when conflict Signed-off-by: asingh51 <[email protected]> fix: resource update when conflict Signed-off-by: asingh51 <[email protected]>

Signed-off-by: asingh51 <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ashu <[email protected]> Signed-off-by: asingh51 <[email protected]>

Signed-off-by: asingh51 <[email protected]>

ashutosh16 requested a review from a team as a code owner January 28, 2025 17:48

ashutosh16 requested a review from a team as a code owner January 28, 2025 18:27

crenshaw-dev requested changes Jan 28, 2025

View reviewed changes

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

agaudreault requested changes Jan 28, 2025

View reviewed changes

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

ashutosh16 force-pushed the argo-cd-import branch from e3ff2cb to cd94425 Compare January 29, 2025 18:31

ashutosh16 requested review from agaudreault and crenshaw-dev January 29, 2025 19:08

ashutosh16 force-pushed the argo-cd-import branch 3 times, most recently from e9025ca to 9b766ea Compare January 30, 2025 17:18

agaudreault requested changes Jan 31, 2025

View reviewed changes

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

ashutosh16 requested a review from agaudreault January 31, 2025 17:00

ashutosh16 changed the title ~~fix(admin cli): add flags to skip certain resources and retry resource on conflict during the import process.~~ fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. Jan 31, 2025

ashutosh16 enabled auto-merge (squash) January 31, 2025 17:44

agaudreault approved these changes Jan 31, 2025

View reviewed changes

crenshaw-dev requested changes Jan 31, 2025

View reviewed changes

ashutosh16 requested a review from crenshaw-dev January 31, 2025 20:28

ashutosh16 force-pushed the argo-cd-import branch 2 times, most recently from c12faf6 to 5210a54 Compare February 3, 2025 17:12

crenshaw-dev requested changes Feb 3, 2025

View reviewed changes

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

crenshaw-dev requested changes Feb 3, 2025

View reviewed changes

cmd/argocd/commands/admin/backup.go Outdated Show resolved Hide resolved

ashutosh16 force-pushed the argo-cd-import branch from 5210a54 to d3dc331 Compare February 3, 2025 20:04

ashutosh16 requested a review from crenshaw-dev February 3, 2025 20:04

crenshaw-dev approved these changes Feb 3, 2025

View reviewed changes

ashutosh16 force-pushed the argo-cd-import branch from b7af0e0 to 869c9be Compare February 3, 2025 20:55

asingh51 added 3 commits February 3, 2025 12:58

fix: resource update when conflict

f84451c

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

5b4396e

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

f2d9501

Signed-off-by: asingh51 <[email protected]>

asingh51 and others added 20 commits February 3, 2025 12:58

fix: resource update when conflict

81766b1

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

e8a643c

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

fbb1655

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

4b2159f

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

a131d8c

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

f0574ee

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

b3f8af8

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

d5f8d0f

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

af43712

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

ce6f4e9

Signed-off-by: asingh51 <[email protected]>

Update cmd/argocd/commands/admin/backup.go

06e9075

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ashu <[email protected]> Signed-off-by: asingh51 <[email protected]>

Update cmd/argocd/commands/admin/backup.go

a9b3ff2

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ashu <[email protected]> Signed-off-by: asingh51 <[email protected]>

Update cmd/argocd/commands/admin/backup.go

a3bfa2c

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ashu <[email protected]> Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

877acb5

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

51fc1de

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

5811ad8

Signed-off-by: asingh51 <[email protected]>

feat: skip the resources in import process

37302d6

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

f8f3d4a

Signed-off-by: asingh51 <[email protected]>

fix: resource update when conflict

ef0fdea

Signed-off-by: asingh51 <[email protected]>

ashutosh16 force-pushed the argo-cd-import branch from 869c9be to ef0fdea Compare February 4, 2025 05:40

ashutosh16 merged commit 99cd3c7 into argoproj:master Feb 4, 2025
26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. #21694

fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. #21694

ashutosh16 commented Jan 28, 2025 •

edited

Loading

bunnyshell bot commented Jan 28, 2025 •

edited

Loading

codecov bot commented Jan 30, 2025 •

edited

Loading

agaudreault left a comment •

edited

Loading

fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. #21694

fix(cli): add flags to admin import for retrying updates on conflicts and skipping resources with specific labels. #21694

Conversation

ashutosh16 commented Jan 28, 2025 • edited Loading

bunnyshell bot commented Jan 28, 2025 • edited Loading

❌ Preview Environment deleted from Bunnyshell

codecov bot commented Jan 30, 2025 • edited Loading

Codecov Report

agaudreault left a comment • edited Loading

Choose a reason for hiding this comment

ashutosh16 commented Jan 28, 2025 •

edited

Loading

bunnyshell bot commented Jan 28, 2025 •

edited

Loading

codecov bot commented Jan 30, 2025 •

edited

Loading

agaudreault left a comment •

edited

Loading