chore: remove managed-by label from kro instances (#997)

* chore: remove managed-by label from kro instances

* chore: remove managed-by label from kro instances

Co-authored-by: Jakob Möller <contact@jakob-moeller.com>

* chore: remove managed-by label from kro instances

---------

Co-authored-by: Jakob Möller <contact@jakob-moeller.com>

Author: shabbskagalwala

pkg/controller/instance/resources.go

@@ -399,7 +399,13 @@ func (c *Controller) applyDecoratorLabels(
 	// Merge tool labels from labeler. On conflict (duplicate keys), log and use
 	// instance labels only - this avoids panic from nil dereference.
 	instanceLabeler := metadata.NewInstanceLabeler(rcx.Instance)
-	toolLabels, err := instanceLabeler.Merge(rcx.Labeler)
+	nodeLabeler := metadata.NewNodeLabeler()
+	merged, err := instanceLabeler.Merge(nodeLabeler)
+	if err != nil {
+		rcx.Log.V(1).Info("label merge conflict between instance and node labeler, using instance labels only", "error", err)
+		merged = instanceLabeler
+	}
+	toolLabels, err := merged.Merge(rcx.Labeler)
 	if err != nil {
 		rcx.Log.V(1).Info("label merge conflict, using instance labels only", "error", err)
 		toolLabels = instanceLabeler

pkg/metadata/labels.go

@@ -176,16 +176,23 @@ func NewInstanceLabeler(instance *unstructured.Unstructured) GenericLabeler {
 	}
 }
 
-// NewKROMetaLabeler returns a new labeler that sets the OwnedLabel,
-// KROVersion, and ManagedBy labels on a resource.
-func NewKROMetaLabeler() GenericLabeler {
+// NewNodeLabeler returns a new labeler for child resources
+// Only includes app.kubernetes.io/managed-by label, as other labels come from the parent labeler.
+func NewNodeLabeler() GenericLabeler {
 	return map[string]string{
-		OwnedLabel:        "true",
-		KROVersionLabel:   safeVersion(version.GetVersionInfo().GitVersion),
 		ManagedByLabelKey: ManagedByKROValue,
 	}
 }
 
+// NewKROMetaLabeler returns a new labeler that sets the OwnedLabel, and
+// KROVersion labels on a resource.
+func NewKROMetaLabeler() GenericLabeler {
+	return map[string]string{
+		OwnedLabel:      "true",
+		KROVersionLabel: safeVersion(version.GetVersionInfo().GitVersion),
+	}
+}
+
 // NewCollectionItemLabeler returns a new labeler that sets collection-specific
 // labels on a resource that is part of a collection (forEach expansion).
 // - node-id: the resource ID from the RGD (e.g "workerPods")

pkg/metadata/labels_test.go

@@ -272,8 +272,16 @@ func TestNewKROMetaLabeler(t *testing.T) {
 	t.Run("NewKROMetaLabeler", func(t *testing.T) {
 		labeler := NewKROMetaLabeler()
 		assert.Equal(t, GenericLabeler{
-			OwnedLabel:        "true",
-			KROVersionLabel:   version.GetVersionInfo().GitVersion,
+			OwnedLabel:      "true",
+			KROVersionLabel: version.GetVersionInfo().GitVersion,
+		}, labeler)
+	})
+}
+
+func TestNewNodeLabeler(t *testing.T) {
+	t.Run("NewNodeLabeler", func(t *testing.T) {
+		labeler := NewNodeLabeler()
+		assert.Equal(t, GenericLabeler{
 			ManagedByLabelKey: ManagedByKROValue,
 		}, labeler)
 	})

test/integration/suites/core/annotation_label_test.go

@@ -139,6 +139,9 @@ var _ = Describe("Labels and Annotations", func() {
 				HaveKeyWithValue(metadata.ResourceGraphDefinitionNameLabel, rgd.GetName()),
 			), "default kro labels should also be present")
 
+			g.Expect(instance.GetLabels()).ToNot(HaveKey(metadata.ManagedByLabelKey),
+				"instance should not have app.kubernetes.io/managed-by label it may be used by other application lifecycle tooling")
+
 		}, 10*time.Second, time.Second).WithContext(ctx).Should(Succeed())
 
 		cfgMap := &corev1.ConfigMap{}