refactor: only rewrite release label

loft-sh · Aug 6, 2024 · a970c33 · a970c33
1 parent f36632b
commit a970c33
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 18 deletions.
diff --git a/pkg/util/translate/labels.go b/pkg/util/translate/labels.go
@@ -8,8 +8,7 @@ import (
 )
 
 var translateLabels = map[string]bool{
-	// rewrite app & release
-	VClusterAppLabel:     true,
+	// rewrite release
 	VClusterReleaseLabel: true,
 
 	// namespace, marker & controlled-by
@@ -58,11 +57,13 @@ func HostLabelsMap(vLabels, pLabels map[string]string, vNamespace string) map[st
 	}
 
 	// check if namespace or cluster-scoped
-	if vNamespace != "" {
-		newLabels[MarkerLabel] = VClusterName
-		newLabels[NamespaceLabel] = vNamespace
-	} else {
-		newLabels[MarkerLabel] = Default.MarkerLabelCluster()
+	if pLabels == nil || pLabels[MarkerLabel] != "" {
+		if vNamespace == "" {
+			newLabels[MarkerLabel] = Default.MarkerLabelCluster()
+		} else if Default.SingleNamespaceTarget() {
+			newLabels[MarkerLabel] = VClusterName
+			newLabels[NamespaceLabel] = vNamespace
+		}
 	}
 
 	// set controller label

diff --git a/pkg/util/translate/translate_test.go b/pkg/util/translate/translate_test.go
@@ -10,6 +10,31 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func TestNotRewritingLabels(t *testing.T) {
+	pMap := map[string]string{
+		"abc": "abc",
+		"def": "def",
+		"hij": "hij",
+		"app": "my-app",
+	}
+
+	pMap = HostLabelsMap(pMap, pMap, "test")
+	assert.DeepEqual(t, map[string]string{
+		"abc": "abc",
+		"def": "def",
+		"hij": "hij",
+		"app": "my-app",
+	}, pMap)
+
+	pMap = VirtualLabelsMap(pMap, pMap)
+	assert.DeepEqual(t, map[string]string{
+		"abc": "abc",
+		"def": "def",
+		"hij": "hij",
+		"app": "my-app",
+	}, pMap)
+}
+
 func TestAnnotations(t *testing.T) {
 	vObj := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
@@ -83,15 +108,15 @@ func TestLabelsMap(t *testing.T) {
 	vMap := map[string]string{
 		"test":    "test",
 		"test123": "test123",
-		"app":     "vcluster",
-		"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster123",
+		"release": "vcluster",
+		"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster123",
 	}
 
 	pMap := HostLabelsMap(vMap, nil, "test")
 	assert.DeepEqual(t, map[string]string{
 		"test":    "test",
 		"test123": "test123",
-		"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster",
+		"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster",
 		MarkerLabel:    VClusterName,
 		NamespaceLabel: "test",
 	}, pMap)
@@ -103,13 +128,13 @@ func TestLabelsMap(t *testing.T) {
 		"test":    "test",
 		"test123": "test123",
 		"other":   "other",
-		"app":     "vcluster",
-		"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster123",
+		"release": "vcluster",
+		"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster123",
 	}, vMap)
 
 	pMap = HostLabelsMap(vMap, pMap, "test")
 	assert.DeepEqual(t, map[string]string{
-		"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster",
+		"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster",
 		MarkerLabel:    VClusterName,
 		NamespaceLabel: "test",
 		"test":         "test",
@@ -123,14 +148,14 @@ func TestLabelSelector(t *testing.T) {
 		MatchLabels: map[string]string{
 			"test":    "test",
 			"test123": "test123",
-			"app":     "vcluster",
+			"release": "vcluster",
 		},
 	})
 	assert.DeepEqual(t, &metav1.LabelSelector{
 		MatchLabels: map[string]string{
 			"test":    "test",
 			"test123": "test123",
-			"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster",
+			"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster",
 		},
 	}, pMap)
 
@@ -139,7 +164,7 @@ func TestLabelSelector(t *testing.T) {
 		MatchLabels: map[string]string{
 			"test":    "test",
 			"test123": "test123",
-			"app":     "vcluster",
+			"release": "vcluster",
 		},
 	}, vMap)
 
@@ -148,7 +173,7 @@ func TestLabelSelector(t *testing.T) {
 		MatchLabels: map[string]string{
 			"test":    "test",
 			"test123": "test123",
-			"vcluster.loft.sh/label-suffix-x-a172cedcae": "vcluster",
+			"vcluster.loft.sh/label-suffix-x-a4d451ec23": "vcluster",
 		},
 	}, pMap)
 }
diff --git a/pkg/util/translate/types.go b/pkg/util/translate/types.go
@@ -13,7 +13,6 @@ var (
 )
 
 var (
-	VClusterAppLabel     = "app"
 	VClusterReleaseLabel = "release"
 	NamespaceLabel       = "vcluster.loft.sh/namespace"
 	MarkerLabel          = "vcluster.loft.sh/managed-by"