Add managed by label to skr-webhook resources and kyma cr

kyma-project · Sep 26, 2024 · 9820cb9 · 9820cb9
1 parent ec2bd89
commit 9820cb9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/internal/declarative/v2/default_transforms.go b/internal/declarative/v2/default_transforms.go
@@ -10,7 +10,6 @@ import (
 )
 
 const (
-	OperatorName              = "module-manager"
 	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."
@@ -42,33 +41,22 @@ func KymaComponentTransform(_ context.Context, obj Object, resources []*unstruct
 	return nil
 }
 
-func ManagedByDeclarativeV2(_ context.Context, _ Object, resources []*unstructured.Unstructured) error {
-	for _, resource := range resources {
-		lbls := resource.GetLabels()
-		if lbls == nil {
-			lbls = make(map[string]string)
-		}
-		// legacy managed by value
-		lbls[shared.ManagedBy] = shared.KymaLabelValue
-		resource.SetLabels(lbls)
-	}
-	return nil
-}
-
-func watchedByOwnedBy(_ context.Context, obj Object, resources []*unstructured.Unstructured) error {
+func WatchedByManagedByOwnedBy(_ context.Context, obj Object, resources []*unstructured.Unstructured) error {
 	for _, resource := range resources {
 		lbls := resource.GetLabels()
 		if lbls == nil {
 			lbls = make(map[string]string)
 		}
 		lbls[shared.WatchedByLabel] = shared.WatchedByLabelValue
+		lbls[shared.ManagedBy] = shared.KymaLabelValue
 
 		annotations := resource.GetAnnotations()
 		if annotations == nil {
 			annotations = make(map[string]string)
 		}
 		annotations[shared.OwnedByAnnotation] = fmt.Sprintf(OwnedByFormat, obj.GetNamespace(), obj.GetName())
 		resource.SetLabels(lbls)
+		resource.SetAnnotations(annotations)
 	}
 	return nil
 }
diff --git a/internal/declarative/v2/default_transforms_test.go b/internal/declarative/v2/default_transforms_test.go
@@ -44,8 +44,8 @@ func Test_defaultTransforms(t *testing.T) {
 			},
 		},
 		{
-			"empty ManagedByDeclarativeV2",
-			declarativev2.ManagedByDeclarativeV2,
+			"empty WatchedByManagedByOwnedBy",
+			declarativev2.WatchedByManagedByOwnedBy,
 			[]*unstructured.Unstructured{},
 			func(testingT assert.TestingT, err error, i ...interface{}) bool {
 				require.NoError(t, err)
@@ -87,8 +87,8 @@ func Test_defaultTransforms(t *testing.T) {
 			},
 		},
 		{
-			"simple ManagedByDeclarativeV2",
-			declarativev2.ManagedByDeclarativeV2,
+			"simple WatchedByManagedByOwnedBy",
+			declarativev2.WatchedByManagedByOwnedBy,
 			[]*unstructured.Unstructured{{Object: map[string]any{}}},
 			func(testingT assert.TestingT, err error, i ...interface{}) bool {
 				require.NoError(t, err)
@@ -97,9 +97,14 @@ func Test_defaultTransforms(t *testing.T) {
 				unstruct := unstructs[0]
 				assert.NotEmpty(testingT, unstruct)
 				assert.NotNil(testingT, unstruct.GetLabels())
+				assert.NotNil(testingT, unstruct.GetAnnotations())
 				assert.Contains(testingT, unstruct.GetLabels(), shared.ManagedBy)
+				assert.Contains(testingT, unstruct.GetLabels(), shared.WatchedByLabel)
+				assert.Contains(testingT, unstruct.GetAnnotations(), shared.OwnedByAnnotation)
 				assert.Equal(testingT, shared.KymaLabelValue,
 					unstruct.GetLabels()[shared.ManagedBy])
+				assert.Equal(testingT, shared.WatchedByLabelValue,
+					unstruct.GetLabels()[shared.WatchedByLabel])
 				return true
 			},
 		},

diff --git a/internal/declarative/v2/options.go b/internal/declarative/v2/options.go
@@ -21,8 +21,7 @@ const (
 func DefaultOptions() *Options {
 	return (&Options{}).Apply(
 		WithPostRenderTransform(
-			ManagedByDeclarativeV2,
-			watchedByOwnedBy,
+			WatchedByManagedByOwnedBy,
 			KymaComponentTransform,
 			DisclaimerTransform,
 		),

diff --git a/internal/remote/skr_context.go b/internal/remote/skr_context.go
@@ -210,6 +210,7 @@ func (s *SkrContext) syncWatcherLabelsAnnotations(controlPlaneKyma, remoteKyma *
 	}
 
 	remoteKyma.Labels[shared.WatchedByLabel] = shared.WatchedByLabelValue
+	remoteKyma.Labels[shared.ManagedBy] = shared.KymaLabelValue
 
 	if remoteKyma.Annotations == nil {
 		remoteKyma.Annotations = make(map[string]string)

diff --git a/pkg/watcher/skr_webhook_resources.go b/pkg/watcher/skr_webhook_resources.go
@@ -59,6 +59,9 @@ func createSKRSecret(cfg *unstructuredResourcesConfig, secretObjKey client.Objec
 		ObjectMeta: apimetav1.ObjectMeta{
 			Name:      secretObjKey.Name,
 			Namespace: secretObjKey.Namespace,
+			Labels: map[string]string{
+				shared.ManagedBy: shared.KymaLabelValue,
+			},
 		},
 		Immutable: nil,
 		Data: map[string][]byte{
@@ -128,6 +131,9 @@ func generateValidatingWebhookConfigFromWatchers(webhookObjKey,
 		ObjectMeta: apimetav1.ObjectMeta{
 			Name:      webhookObjKey.Name,
 			Namespace: webhookObjKey.Namespace,
+			Labels: map[string]string{
+				shared.ManagedBy: shared.KymaLabelValue,
+			},
 		},
 		Webhooks: webhooks,
 	}
@@ -187,6 +193,13 @@ func configureDeployment(cfg *unstructuredResourcesConfig, obj *unstructured.Uns
 	}
 	deployment.Spec.Template.Spec.Containers[0] = serverContainer
 
+	labels := deployment.GetLabels()
+	if labels == nil {
+		labels = make(map[string]string)
+	}
+	labels[shared.ManagedBy] = shared.KymaLabelValue
+	deployment.SetLabels(labels)
+
 	return deployment, nil
 }