move cluster lifecycle service monitor to component namespace

Signed-off-by: Yang Le <[email protected]>
stolostron · Sep 26, 2023 · 840fa54 · 840fa54
1 parent 646f3be
commit 840fa54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/backplaneconfig_controller_test.go b/controllers/backplaneconfig_controller_test.go
@@ -447,7 +447,7 @@ var _ = Describe("BackplaneConfig controller", func() {
 					ctx := context.Background()
 					u := &unstructured.Unstructured{}
 					u.SetName("clusterlifecycle-state-metrics-v2")
-					u.SetNamespace("openshift-monitoring")
+					u.SetNamespace(DestinationNamespace)
 					u.SetGroupVersionKind(schema.GroupVersionKind{
 						Group:   "monitoring.coreos.com",
 						Kind:    "ServiceMonitor",
@@ -459,7 +459,7 @@ var _ = Describe("BackplaneConfig controller", func() {
 					ctx := context.Background()
 					namespacedName := types.NamespacedName{
 						Name:      "clusterlifecycle-state-metrics-v2",
-						Namespace: "openshift-monitoring",
+						Namespace: DestinationNamespace,
 					}
 					resourceType := &monitoringv1.ServiceMonitor{}
 					return k8sClient.Get(ctx, namespacedName, resourceType)

diff --git a/pkg/templates/charts/toggle/cluster-lifecycle/templates/metrics-servicemonitor.yaml b/pkg/templates/charts/toggle/cluster-lifecycle/templates/metrics-servicemonitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: clusterlifecycle-state-metrics-v2
-  namespace: openshift-monitoring
+  namespace: {{ .Values.global.namespace }}
 spec:
   endpoints:
   - interval: 60s