From 97e417b8d9c66df655c0e9a6d0c7f9ebbce63757 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Mon, 21 Nov 2022 10:40:26 +0800 Subject: [PATCH] fix: cluster.metricsCollector invoked before assign when MountWebhooks (#1428) (#1469) --- pkg/api/server.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/api/server.go b/pkg/api/server.go index 95027d8d10..c0333c8929 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -30,6 +30,7 @@ import ( "github.com/apache/apisix-ingress-controller/pkg/apisix" "github.com/apache/apisix-ingress-controller/pkg/config" "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/metrics" "github.com/apache/apisix-ingress-controller/pkg/types" ) @@ -81,9 +82,10 @@ func NewServer(cfg *config.Config) (*Server, error) { admission := gin.New() admission.Use(gin.Recovery(), gin.Logger()) apirouter.MountWebhooks(admission, &apisix.ClusterOptions{ - Name: cfg.APISIX.DefaultClusterName, - AdminKey: cfg.APISIX.DefaultClusterAdminKey, - BaseURL: cfg.APISIX.DefaultClusterBaseURL, + Name: cfg.APISIX.DefaultClusterName, + AdminKey: cfg.APISIX.DefaultClusterAdminKey, + BaseURL: cfg.APISIX.DefaultClusterBaseURL, + MetricsCollector: metrics.NewPrometheusCollector(), }) srv.admissionServer = &http.Server{