From 4591898ac943508fca606802c46ad9cd948486dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Enrique=20Llorente=20Pastora?= Date: Thu, 28 Nov 2019 11:08:55 +0100 Subject: [PATCH] Fix monitoring logs (#277) * Revert "Remove logs from metrics after operator-sdk upgrade (#263)" This reverts commit afbc990af494f75faf8b1a3f8aa6bdc129270c61. * Fix role for operator-sdk 0.12.0 Signed-off-by: Quique Llorente --- cmd/manager/main.go | 10 +++++----- deploy/role.yaml | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 2482c3e925..9bcb9438e7 100644 --- 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 index e126e24daa..fab7f4a01c 100644 --- 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