Merge pull request #2641 from slashpai/OCPBUGS-60221

openshift-merge-bot[bot] · web-flow · commit 5db9394cfebb · 2025-08-11T11:41:52.000Z
OCPBUGS-60221: remove `managed_cluster` from reserved external labels
diff --git a/pkg/manifests/config.go b/pkg/manifests/config.go
@@ -54,7 +54,7 @@ const (
 )
 
 var errAlertmanagerV1NotSupported = errors.New("alertmanager's apiVersion=v1 is no longer supported, v2 has been available since Alertmanager 0.16.0")
-var reservedPrometheusExternalLabels = []string{"prometheus", "prometheus_replica", "cluster", "managed_cluster"}
+var reservedPrometheusExternalLabels = []string{"prometheus", "prometheus_replica", "cluster"}
 
 type Config struct {
 	Images                               *Images `json:"-"`
diff --git a/pkg/manifests/manifests_test.go b/pkg/manifests/manifests_test.go
@@ -5285,7 +5285,7 @@ func TestPromConfigurationExternalLabels(t *testing.T) {
 					name: "one rempty reserved",
 					template: `%s:
   externalLabels:
-    managed_cluster:
+    cluster:
     bar: foo
 `,
 					shouldFail: true,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const (`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`var errAlertmanagerV1NotSupported = errors.New("alertmanager's apiVersion=v1 is no longer supported, v2 has been available since Alertmanager 0.16.0")`
`57`		`-var reservedPrometheusExternalLabels = []string{"prometheus", "prometheus_replica", "cluster", "managed_cluster"}`
	`57`	`+var reservedPrometheusExternalLabels = []string{"prometheus", "prometheus_replica", "cluster"}`
`58`	`58`
`59`	`59`	`type Config struct {`
`60`	`60`	Images *Images `json:"-"`