From b027f87032426295abe0916822528aa8d2d0b794 Mon Sep 17 00:00:00 2001 From: ario0 <118843430+ario0@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:47:47 +0100 Subject: [PATCH] docs: mention that the argocd diff command does not include secrets (#15950) * doc(cli): update argocd_app_diff Adding the fact that secrets are ignored by the diff (not really stated in the doc so far) Signed-off-by: ario0 <118843430+ario0@users.noreply.github.com> * doc: remove whitespace Signed-off-by: ario0 <118843430+ario0@users.noreply.github.com> --------- Signed-off-by: ario0 <118843430+ario0@users.noreply.github.com> Signed-off-by: Alexis Renard Co-authored-by: pasha-codefresh Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> --- cmd/argocd/commands/app.go | 2 +- docs/user-guide/commands/argocd_app_diff.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index 25c02db5f291d5..7ad3d7646fa29f 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -1084,7 +1084,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co var command = &cobra.Command{ Use: "diff APPNAME", Short: shortDesc, - Long: shortDesc + "\nUses 'diff' to render the difference. KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own diff tool.\nReturns the following exit codes: 2 on general errors, 1 when a diff is found, and 0 when no diff is found", + Long: shortDesc + "\nUses 'diff' to render the difference. KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own diff tool.\nReturns the following exit codes: 2 on general errors, 1 when a diff is found, and 0 when no diff is found\nKubernetes Secrets are ignored from this diff.", Run: func(c *cobra.Command, args []string) { ctx := c.Context() diff --git a/docs/user-guide/commands/argocd_app_diff.md b/docs/user-guide/commands/argocd_app_diff.md index 18cc8f4751324c..b352c30123eca2 100644 --- a/docs/user-guide/commands/argocd_app_diff.md +++ b/docs/user-guide/commands/argocd_app_diff.md @@ -9,6 +9,7 @@ Perform a diff against the target and live state. Perform a diff against the target and live state. Uses 'diff' to render the difference. KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own diff tool. Returns the following exit codes: 2 on general errors, 1 when a diff is found, and 0 when no diff is found +Kubernetes Secrets are ignored from this diff. ``` argocd app diff APPNAME [flags]