Only add cluster tags when cluster-tagstyle is explicitly set

Previously, remote cluster resources were auto-tagged with a default blue
color. Now tags are only added when the cluster-tagstyle label is explicitly
configured in the cluster's clusterLabels.

Updated tests to verify:
- No tag added when cluster-tagstyle is not set
- Tag added with correct style when cluster-tagstyle is set

Author: rajsinghtech

pkg/homer/cluster_tag_test.go

@@ -19,34 +19,33 @@ func TestIngressClusterAutoTag(t *testing.T) {
 		expectedTagStyle string
 	}{
 		{
-			name:             "Remote cluster ottawa - default blue",
-			clusterAnnot:     "ottawa",
-			expectTag:        true,
-			expectedTagName:  "ottawa",
-			expectedTagStyle: "is-info", // Default blue
+			name:         "Remote cluster without tagstyle - no tag",
+			clusterAnnot: "ottawa",
+			expectTag:    false,
 		},
 		{
-			name:             "Remote cluster robbinsdale - default blue",
-			clusterAnnot:     "robbinsdale",
+			name:             "Remote cluster with blue tag",
+			clusterAnnot:     "ottawa",
+			tagStyleLabel:    "is-info",
 			expectTag:        true,
-			expectedTagName:  "robbinsdale",
-			expectedTagStyle: "is-info", // Default blue
+			expectedTagName:  "ottawa",
+			expectedTagStyle: "is-info",
 		},
 		{
-			name:             "Remote cluster with custom red color",
-			clusterAnnot:     "ottawa",
+			name:             "Remote cluster with red tag",
+			clusterAnnot:     "production",
 			tagStyleLabel:    "is-danger",
 			expectTag:        true,
-			expectedTagName:  "ottawa",
-			expectedTagStyle: "is-danger", // Custom red
+			expectedTagName:  "production",
+			expectedTagStyle: "is-danger",
 		},
 		{
-			name:             "Remote cluster with custom yellow color",
+			name:             "Remote cluster with yellow tag",
 			clusterAnnot:     "staging",
 			tagStyleLabel:    "is-warning",
 			expectTag:        true,
 			expectedTagName:  "staging",
-			expectedTagStyle: "is-warning", // Custom yellow
+			expectedTagStyle: "is-warning",
 		},
 		{
 			name:         "Local cluster",
@@ -137,26 +136,25 @@ func TestHTTPRouteClusterAutoTag(t *testing.T) {
 		expectedTagStyle string
 	}{
 		{
-			name:             "Remote cluster ottawa - default blue",
-			clusterAnnot:     "ottawa",
-			expectTag:        true,
-			expectedTagName:  "ottawa",
-			expectedTagStyle: "is-info", // Default blue
+			name:         "Remote cluster without tagstyle - no tag",
+			clusterAnnot: "ottawa",
+			expectTag:    false,
 		},
 		{
-			name:             "Remote cluster robbinsdale - default blue",
-			clusterAnnot:     "robbinsdale",
+			name:             "Remote cluster with blue tag",
+			clusterAnnot:     "ottawa",
+			tagStyleLabel:    "is-info",
 			expectTag:        true,
-			expectedTagName:  "robbinsdale",
-			expectedTagStyle: "is-info", // Default blue
+			expectedTagName:  "ottawa",
+			expectedTagStyle: "is-info",
 		},
 		{
-			name:             "Remote cluster with custom red color",
+			name:             "Remote cluster with red tag",
 			clusterAnnot:     "production",
 			tagStyleLabel:    "is-danger",
 			expectTag:        true,
 			expectedTagName:  "production",
-			expectedTagStyle: "is-danger", // Custom red
+			expectedTagStyle: "is-danger",
 		},
 		{
 			name:         "Local cluster",

pkg/homer/config.go

@@ -1177,16 +1177,13 @@ func createIngressItem(ingress networkingv1.Ingress, host string, validRuleCount
 	item.Namespace = ingress.ObjectMeta.Namespace
 	item.LastUpdate = ingress.ObjectMeta.CreationTimestamp.Time.Format("2006-01-02T15:04:05Z")
 
-	// Auto-tag with cluster name if present
+	// Auto-tag with cluster name if cluster-tagstyle label is set
 	if clusterName, ok := ingress.ObjectMeta.Annotations["homer.rajsingh.info/cluster"]; ok && clusterName != "" && clusterName != "local" {
-		setItemParameter(&item, "tag", clusterName)
-
-		// Check if cluster-tagstyle label is set, otherwise use default blue
-		tagStyle := "is-info" // Default blue
-		if customStyle, hasStyle := ingress.ObjectMeta.Labels["cluster-tagstyle"]; hasStyle && customStyle != "" {
-			tagStyle = customStyle
+		// Only add tag if cluster-tagstyle is explicitly set
+		if tagStyle, hasStyle := ingress.ObjectMeta.Labels["cluster-tagstyle"]; hasStyle && tagStyle != "" {
+			setItemParameter(&item, "tag", clusterName)
+			setItemParameter(&item, "tagstyle", tagStyle)
 		}
-		setItemParameter(&item, "tagstyle", tagStyle)
 	}
 
 	return item
@@ -1322,16 +1319,13 @@ func createHTTPRouteItem(httproute *gatewayv1.HTTPRoute, hostname, protocol stri
 		setItemParameter(&item, "subtitle", "")
 	}
 
-	// Auto-tag with cluster name if present
+	// Auto-tag with cluster name if cluster-tagstyle label is set
 	if clusterName, ok := httproute.ObjectMeta.Annotations["homer.rajsingh.info/cluster"]; ok && clusterName != "" && clusterName != "local" {
-		setItemParameter(&item, "tag", clusterName)
-
-		// Check if cluster-tagstyle label is set, otherwise use default blue
-		tagStyle := "is-info" // Default blue
-		if customStyle, hasStyle := httproute.ObjectMeta.Labels["cluster-tagstyle"]; hasStyle && customStyle != "" {
-			tagStyle = customStyle
+		// Only add tag if cluster-tagstyle is explicitly set
+		if tagStyle, hasStyle := httproute.ObjectMeta.Labels["cluster-tagstyle"]; hasStyle && tagStyle != "" {
+			setItemParameter(&item, "tag", clusterName)
+			setItemParameter(&item, "tagstyle", tagStyle)
 		}
-		setItemParameter(&item, "tagstyle", tagStyle)
 	}
 
 	return item