From 51964093a899b5dc33fe4b93e6e0e933b2f2bdbc Mon Sep 17 00:00:00 2001 From: Matthew Mead-Briggs Date: Thu, 17 Oct 2019 10:04:33 -0700 Subject: [PATCH] Set namespsace for metrics to WATCH_NAMESPACE Often the operator is in the same namespace as the things it's watching and this works okay. We deploy the operator to a different namespace. Anyway, I think this should be the watch namespace since that's where we're expecting the CRDs to be. --- internal/pkg/scaffold/cmd.go | 2 +- internal/pkg/scaffold/cmd_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/pkg/scaffold/cmd.go b/internal/pkg/scaffold/cmd.go index 8f46937c3c..fba2bab363 100644 --- a/internal/pkg/scaffold/cmd.go +++ b/internal/pkg/scaffold/cmd.go @@ -198,7 +198,7 @@ func serveCRMetrics(cfg *rest.Config) error { return err } // Get the namespace the operator is currently deployed in. - operatorNs, err := k8sutil.GetOperatorNamespace() + operatorNs, err := k8sutil.GetWatchNamespace() if err != nil { return err } diff --git a/internal/pkg/scaffold/cmd_test.go b/internal/pkg/scaffold/cmd_test.go index 86a19c7021..b84deda777 100644 --- a/internal/pkg/scaffold/cmd_test.go +++ b/internal/pkg/scaffold/cmd_test.go @@ -197,7 +197,7 @@ func serveCRMetrics(cfg *rest.Config) error { return err } // Get the namespace the operator is currently deployed in. - operatorNs, err := k8sutil.GetOperatorNamespace() + operatorNs, err := k8sutil.GetWatchNamespace() if err != nil { return err }