From db82456dde06043de78fbbd766e8b1c5d146ad07 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 15 Apr 2019 16:46:03 -0400 Subject: [PATCH] don't compare secrets, since argo-cd doesn't have access to their data (#1459) --- cmd/argocd/commands/app.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index cee28e8766..934841b588 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -705,7 +705,11 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co errors.CheckError(err) key = kube.GetResourceKey(target) } - + if key.Kind == "Secret" { + // Don't bother comparing secrets, argo-cd doesn't have access to k8s secret data + delete(localObjs, key) + continue + } if local, ok := localObjs[key]; ok || live != nil { if local != nil && !kube.IsCRD(local) { err = kube.SetAppInstanceLabel(local, argoSettings.AppLabelKey, appName)