From a2b1235c8d4cc0d0d440fd9c56e462c312975765 Mon Sep 17 00:00:00 2001 From: darshanime Date: Fri, 12 Jun 2020 14:45:16 +0530 Subject: [PATCH] feat: ignore status globally Signed-off-by: darshanime --- cmd/argocd-util/commands/settings_test.go | 2 +- util/argo/normalizers/diff_normalizer.go | 8 +++++++- util/settings/settings.go | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/argocd-util/commands/settings_test.go b/cmd/argocd-util/commands/settings_test.go index 2d7d51abd37e..b8c43fc1b1c2 100644 --- a/cmd/argocd-util/commands/settings_test.go +++ b/cmd/argocd-util/commands/settings_test.go @@ -195,7 +195,7 @@ admissionregistration.k8s.io/MutatingWebhookConfiguration: jsonPointers: - /webhooks/0/clientConfig/caBundle`, }, - containsSummary: "1 resource overrides", + containsSummary: "2 resource overrides", }, } for name := range testCases { diff --git a/util/argo/normalizers/diff_normalizer.go b/util/argo/normalizers/diff_normalizer.go index 2e7dc46fd9eb..d7f3758218a7 100644 --- a/util/argo/normalizers/diff_normalizer.go +++ b/util/argo/normalizers/diff_normalizer.go @@ -6,7 +6,7 @@ import ( "github.com/argoproj/gitops-engine/pkg/diff" jsonpatch "github.com/evanphx/json-patch" log "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -76,7 +76,13 @@ func NewIgnoreNormalizer(ignore []v1alpha1.ResourceIgnoreDifferences, overrides func (n *ignoreNormalizer) Normalize(un *unstructured.Unstructured) error { matched := make([]normalizerPatch, 0) for _, patch := range n.patches { + if patch.groupKind.Group == "" && patch.groupKind.Kind == "" { + matched = append(matched, patch) + continue + } + groupKind := un.GroupVersionKind().GroupKind() + if groupKind == patch.groupKind && (patch.name == "" || patch.name == un.GetName()) && (patch.namespace == "" || patch.namespace == un.GetNamespace()) { diff --git a/util/settings/settings.go b/util/settings/settings.go index 9487005a7fbe..3a37485fa99a 100644 --- a/util/settings/settings.go +++ b/util/settings/settings.go @@ -447,7 +447,7 @@ func (mgr *SettingsManager) GetResourceOverrides() (map[string]v1alpha1.Resource return nil, err } } - + resourceOverrides["/"] = v1alpha1.ResourceOverride{IgnoreDifferences: "jsonPointers:\n- /status"} return resourceOverrides, nil }