From 869c9bec4879f96f3ec444ccd1882448172f37ff Mon Sep 17 00:00:00 2001 From: asingh51 Date: Mon, 3 Feb 2025 12:50:11 -0800 Subject: [PATCH] fix: resource update when conflict Signed-off-by: asingh51 --- cmd/argocd/commands/admin/backup_test.go | 3 ++- docs/user-guide/commands/argocd_admin_import.md | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/argocd/commands/admin/backup_test.go b/cmd/argocd/commands/admin/backup_test.go index c485f97bc97bf..838ac788d15ee 100644 --- a/cmd/argocd/commands/admin/backup_test.go +++ b/cmd/argocd/commands/admin/backup_test.go @@ -85,6 +85,7 @@ func Test_updateTracking(t *testing.T) { }) } } + func TestIsSkipLabelMatches(t *testing.T) { tests := []struct { name string @@ -156,4 +157,4 @@ func TestIsSkipLabelMatches(t *testing.T) { assert.Equal(t, tt.expected, result) }) } -} \ No newline at end of file +} diff --git a/docs/user-guide/commands/argocd_admin_import.md b/docs/user-guide/commands/argocd_admin_import.md index 81fdc4ab6e7b1..7223c266830bc 100644 --- a/docs/user-guide/commands/argocd_admin_import.md +++ b/docs/user-guide/commands/argocd_admin_import.md @@ -35,8 +35,7 @@ argocd admin import SOURCE [flags] --prune Prune secrets, applications and projects which do not appear in the backup --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0") --server string The address and port of the Kubernetes API server - --skip-resources-with-label strings Skip importing resources based on the label e.g. '--skip-resources-with-labels my-label/example.io=true' - + --skip-resources-with-label string Skip importing resources based on the label e.g. '--skip-resources-with-label my-label/example.io=true' --stop-operation Stop any existing operations --tls-server-name string If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used. --token string Bearer token for authentication to the API server