Merge pull request #13236 from rkachach/fix_issue_monitoring_namespace

manifest: adding the namespace tag to the monitoring manifests

deploy/examples/monitoring/csi-metrics-service-monitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: csi-metrics
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
   labels:
     team: rook
 spec:

deploy/examples/monitoring/exporter-service-monitor.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: rook-ceph-exporter
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
   labels:
     team: rook
 spec:

deploy/examples/monitoring/externalrules.yaml

@@ -6,7 +6,7 @@ metadata:
     prometheus: rook-prometheus
     role: alert-rules
   name: prometheus-ceph-rules
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   groups:
     - name: persistent-volume-alert.rules

deploy/examples/monitoring/prometheus-service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: rook-prometheus
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   type: NodePort
   ports:

deploy/examples/monitoring/prometheus.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: prometheus
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -46,13 +46,13 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prometheus
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
   name: rook-prometheus
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
   labels:
     prometheus: rook-prometheus
 spec:

deploy/examples/monitoring/rbac.yaml

@@ -5,7 +5,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-monitor
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 rules:
   - apiGroups:
       - monitoring.coreos.com
@@ -26,7 +26,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-monitor
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -34,7 +34,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: rook-ceph-system
-    namespace: rook-ceph
+    namespace: rook-ceph # namespace:cluster
 # OLM: END ROLE BINDING
 ---
 # OLM: BEGIN ROLE
@@ -43,7 +43,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-metrics
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 rules:
   - apiGroups:
       - ""
@@ -63,7 +63,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-metrics
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -72,7 +72,7 @@ subjects:
   - kind: ServiceAccount
     # change to the serviceaccount and namespace to use for monitoring
     name: prometheus-k8s
-    namespace: rook-ceph
+    namespace: rook-ceph # namespace:cluster
 # OLM: END ROLE BINDING
 ---
 # OLM: BEGIN ROLE
@@ -81,7 +81,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-monitor-mgr
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 rules:
   - apiGroups:
       - monitoring.coreos.com
@@ -100,7 +100,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-monitor-mgr
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -108,6 +108,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: rook-ceph-mgr
-    namespace: rook-ceph
+    namespace: rook-ceph # namespace:cluster
 # OLM: END ROLE BINDING
 ---

deploy/examples/monitoring/service-monitor.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: rook-ceph-mgr
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
   labels:
     team: rook
 spec: