Merge branch 'kubernetes-sigs:main' into docsaurs_mermaid

Author: kennygt51

pkg/metadata/labels.go

@@ -37,6 +37,9 @@ const (
 	OwnedLabel      = LabelKROPrefix + "owned"
 	KROVersionLabel = LabelKROPrefix + "kro-version"
 
+	ManagedByLabelKey = "app.kubernetes.io/managed-by"
+	ManagedByKROValue = "kro"
+
 	InstanceIDLabel        = LabelKROPrefix + "instance-id"
 	InstanceLabel          = LabelKROPrefix + "instance-name"
 	InstanceNamespaceLabel = LabelKROPrefix + "instance-namespace"
@@ -50,6 +53,9 @@ const (
 // IsKROOwned returns true if the resource is owned by KRO.
 func IsKROOwned(meta metav1.Object) bool {
 	v, ok := meta.GetLabels()[OwnedLabel]
+	if !ok {
+		return meta.GetLabels()[ManagedByLabelKey] == ManagedByKROValue
+	}
 	return ok && booleanFromString(v)
 }
 
@@ -85,11 +91,13 @@ func CompareRGDOwnership(existing, desired metav1.ObjectMeta) (kroOwned, nameMat
 // SetKROOwned sets the OwnedLabel to true on the resource.
 func SetKROOwned(meta metav1.ObjectMeta) {
 	setLabel(&meta, OwnedLabel, stringFromBoolean(true))
+	setLabel(&meta, ManagedByLabelKey, ManagedByKROValue)
 }
 
 // SetKROUnowned sets the OwnedLabel to false on the resource.
 func SetKROUnowned(meta metav1.ObjectMeta) {
 	setLabel(&meta, OwnedLabel, stringFromBoolean(false))
+	unsetLabel(&meta, ManagedByLabelKey, ManagedByKROValue)
 }
 
 var (
@@ -205,3 +213,16 @@ func setLabel(meta metav1.Object, key, value string) {
 	labels[key] = value
 	meta.SetLabels(labels)
 }
+
+// Helper function to unset a label
+func unsetLabel(meta metav1.Object, key, value string) {
+	labels := meta.GetLabels()
+	if labels == nil {
+		return
+	}
+	v := labels[key]
+	if v == value {
+		delete(labels, key)
+		meta.SetLabels(labels)
+	}
+}

pkg/metadata/labels_test.go

@@ -162,12 +162,16 @@ func TestSetKROOwned(t *testing.T) {
 		{
 			name:          "set owned on empty label",
 			initialLabels: map[string]string{},
-			expected:      map[string]string{OwnedLabel: "true"},
+			expected: map[string]string{
+				OwnedLabel: "true", ManagedByLabelKey: ManagedByKROValue,
+			},
 		},
 		{
-			name:          "override existing owned label",
-			initialLabels: map[string]string{OwnedLabel: "false"},
-			expected:      map[string]string{OwnedLabel: "true"},
+			name:          "override existing owned and mangedby labels",
+			initialLabels: map[string]string{OwnedLabel: "false", ManagedByLabelKey: "other"},
+			expected: map[string]string{
+				OwnedLabel: "true", ManagedByLabelKey: ManagedByKROValue,
+			},
 		},
 	}
 
@@ -189,13 +193,20 @@ func TestSetKROUnowned(t *testing.T) {
 		{
 			name:          "set unowned on empty label",
 			initialLabels: map[string]string{},
-			expected:      map[string]string{OwnedLabel: "false"},
+			expected: map[string]string{
+				OwnedLabel: "false",
+			},
 		},
 		{
-			name:          "override existing owned label",
-			initialLabels: map[string]string{OwnedLabel: "true"},
+			name:          "override existing owned label and remove managedBy label",
+			initialLabels: map[string]string{OwnedLabel: "true", ManagedByLabelKey: ManagedByKROValue},
 			expected:      map[string]string{OwnedLabel: "false"},
 		},
+		{
+			name:          "don't remove if mangedBy label if value is not kro",
+			initialLabels: map[string]string{OwnedLabel: "true", ManagedByLabelKey: "other"},
+			expected:      map[string]string{OwnedLabel: "false", ManagedByLabelKey: "other"},
+		},
 	}
 
 	for _, tc := range cases {

test/integration/suites/core/kubernetes_time_test.go

@@ -1,3 +1,17 @@
+// Copyright 2025 The Kube Resource Orchestrator Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package core_test
 
 import (