Managedby label

api/shared/operator_labels.go

@@ -8,7 +8,8 @@ const (
 	ControllerName = OperatorGroup + Separator + "controller-name"
 	ChannelLabel   = OperatorGroup + Separator + "channel"
 	// ManagedBy defines the controller managing the resource.
-	ManagedBy = OperatorGroup + Separator + "managed-by"
+	ManagedBy      = OperatorGroup + Separator + "managed-by"
+	KymaLabelValue = "kyma"
 
 	IstioInjectionLabel = "istio-injection"
 	WardenLabel         = "namespaces.warden.kyma-project.io/validate"

internal/declarative/v2/default_transforms.go

@@ -11,7 +11,6 @@ import (
 
 const (
 	OperatorName              = "module-manager"
-	ManagedByLabelValue       = "declarative-v2"
 	DisclaimerAnnotation      = shared.OperatorGroup + shared.Separator + "managed-by-reconciler-disclaimer"
 	DisclaimerAnnotationValue = "DO NOT EDIT - This resource is managed by Kyma.\n" +
 		"Any modifications are discarded and the resource is reverted to the original state."
@@ -50,7 +49,7 @@ func ManagedByDeclarativeV2(_ context.Context, _ Object, resources []*unstructur
 			lbls = make(map[string]string)
 		}
 		// legacy managed by value
-		lbls[shared.ManagedBy] = ManagedByLabelValue
+		lbls[shared.ManagedBy] = shared.KymaLabelValue
 		resource.SetLabels(lbls)
 	}
 	return nil

internal/declarative/v2/default_transforms_test.go

@@ -98,7 +98,7 @@ func Test_defaultTransforms(t *testing.T) {
 				assert.NotEmpty(testingT, unstruct)
 				assert.NotNil(testingT, unstruct.GetLabels())
 				assert.Contains(testingT, unstruct.GetLabels(), shared.ManagedBy)
-				assert.Equal(testingT, declarativev2.ManagedByLabelValue,
+				assert.Equal(testingT, shared.KymaLabelValue,
 					unstruct.GetLabels()[shared.ManagedBy])
 				return true
 			},

internal/remote/skr_context.go

@@ -76,7 +76,7 @@ func (s *SkrContext) CreateKymaNamespace(ctx context.Context) error {
 		ObjectMeta: apimetav1.ObjectMeta{
 			Name: shared.DefaultRemoteNamespace,
 			Labels: map[string]string{
-				shared.ManagedBy:           shared.OperatorName,
+				shared.ManagedBy:           shared.KymaLabelValue,
 				shared.IstioInjectionLabel: shared.EnabledValue,
 				shared.WardenLabel:         shared.EnabledValue,
 			},

tests/integration/controller/mandatorymodule/deletion/controller_test.go

@@ -102,7 +102,8 @@ func registerControlPlaneLifecycleForKyma(kyma *v1beta2.Kyma) {
 
 		installName := filepath.Join("main-dir", "installs")
 		mandatoryManifest.Annotations = map[string]string{shared.FQDN: "kyma-project.io/template-operator"}
-		validImageSpec, err := CreateOCIImageSpecFromFile(installName, server.Listener.Addr().String(), manifestFilePath,
+		validImageSpec, err := CreateOCIImageSpecFromFile(installName, server.Listener.Addr().String(),
+			manifestFilePath,
 			false)
 		Expect(err).NotTo(HaveOccurred())
 		imageSpecByte, err := json.Marshal(validImageSpec)