Fix monitoring logs (#277)

* Revert "Remove logs from metrics after operator-sdk upgrade (#263)" This reverts commit afbc990. * Fix role for operator-sdk 0.12.0 Signed-off-by: Quique Llorente <[email protected]>
nmstate · Nov 28, 2019 · 4591898 · 4591898 · obrienrobert · Dec 7, 2019
1 parent 6251cdb
commit 4591898
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -160,11 +160,11 @@ func serveCRMetrics(cfg *rest.Config) error {
 	if err != nil {
 		return err
 	}
-
-	// To bypass ugly metrics logs after operator-sdk 0.12.0 upgrade
-	// https://github.com/operator-framework/operator-sdk/issues/1858#issuecomment-548323725
-	operatorNs := ""
-
+	// Get the namespace the operator is currently deployed in.
+	operatorNs, err := k8sutil.GetOperatorNamespace()
+	if err != nil {
+		return err
+	}
 	// To generate metrics in other namespaces, add the values below.
 	ns := []string{operatorNs}
 	// Generate and serve custom resource specific metrics.

diff --git a/deploy/role.yaml b/deploy/role.yaml
@@ -15,6 +15,7 @@ rules:
   - events
   - configmaps
   - secrets
+  - pods
   verbs:
   - '*'
 - apiGroups:
@@ -62,3 +63,4 @@ rules:
   verbs:
   - get
   - list
+  - watch
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ rules: @@
       - events
       - configmaps
       - secrets
+      - pods
       verbs:
       - '*'
     - apiGroups:
@@ Expand Down Expand Up / @@ -62,3 +63,4 @@ rules: @@
       verbs:
       - get
       - list
+      - watch