Skip to content

fix: do not normalize resource tracking on live crds #22722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 21, 2025
Merged

fix: do not normalize resource tracking on live crds #22722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c464c0
fix: do not normalize resource tracking on live crds
blakepettersson Apr 18, 2025
0a9cda4
chore: add test and minor refactor
blakepettersson Apr 18, 2025
77d60d4
chore: lint
blakepettersson Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions util/argo/resource_tracking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"regexp"
"strings"

kubeutil "github.com/argoproj/gitops-engine/pkg/utils/kube"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/argoproj/argo-cd/v3/common"
Expand Down Expand Up @@ -232,6 +233,11 @@ func (rt *resourceTracking) Normalize(config, live *unstructured.Unstructured, l
return nil
}

if kubeutil.IsCRD(live) {
// CRDs don't get tracking annotations.
return nil
}

annotation, err := kube.GetAppInstanceAnnotation(config, common.AnnotationKeyAppInstance)
if err != nil {
return err
Expand Down
44 changes: 44 additions & 0 deletions util/argo/resource_tracking_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,50 @@ func TestResourceIdNormalizer_Normalize(t *testing.T) {
assert.False(t, hasOldLabel)
}

func TestResourceIdNormalizer_NormalizeCRD(t *testing.T) {
rt := NewResourceTracking()

// live object is a CRD resource
liveObj := &unstructured.Unstructured{
Object: map[string]any{
"apiVersion": "apiextensions.k8s.io/v1",
"kind": "CustomResourceDefinition",
"metadata": map[string]any{
"name": "crontabs.stable.example.com",
"labels": map[string]any{
common.LabelKeyAppInstance: "my-app",
},
},
"spec": map[string]any{
"group": "stable.example.com",
"scope": "Namespaced",
},
},
}

// config object is a CRD resource
configObj := &unstructured.Unstructured{
Object: map[string]any{
"apiVersion": "apiextensions.k8s.io/v1",
"kind": "CustomResourceDefinition",
"metadata": map[string]any{
"name": "crontabs.stable.example.com",
"labels": map[string]any{
common.LabelKeyAppInstance: "my-app",
},
},
"spec": map[string]any{
"group": "stable.example.com",
"scope": "Namespaced",
},
},
}

require.NoError(t, rt.Normalize(configObj, liveObj, common.LabelKeyAppInstance, string(TrackingMethodAnnotation)))
// the normalization should not apply any changes to the live object
require.NotContains(t, liveObj.GetAnnotations(), common.AnnotationKeyAppInstance)
}

func TestResourceIdNormalizer_Normalize_ConfigHasOldLabel(t *testing.T) {
rt := NewResourceTracking()

Expand Down
Loading