From 2a4a4316dd6b577b90f22064403038f1d97074ac Mon Sep 17 00:00:00 2001 From: bogo Date: Fri, 13 Oct 2023 20:14:34 +0800 Subject: [PATCH] run make update-lint and set EnabledMetrics=false in the server config --- cmd/adapter/adapter.go | 6 ++++++ pkg/client/metrics/metrics.go | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index c20a6f59..c5208461 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -268,6 +268,12 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client, stop return err } + config, err := cmd.Config() + if err != nil { + return err + } + config.GenericConfig.EnableMetrics = false + server, err := cmd.Server() if err != nil { return err diff --git a/pkg/client/metrics/metrics.go b/pkg/client/metrics/metrics.go index 9b2d9e30..0016d112 100644 --- a/pkg/client/metrics/metrics.go +++ b/pkg/client/metrics/metrics.go @@ -24,9 +24,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "k8s.io/component-base/metrics/legacyregistry" apimetrics "k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/legacyregistry" + "sigs.k8s.io/prometheus-adapter/pkg/client" )