From 8bcbc00a6ced4d3aefbb53cbd18eeb51db0a610f Mon Sep 17 00:00:00 2001
From: Riya Singhal <rsinghal@redhat.com>
Date: Tue, 29 Aug 2023 14:47:27 +0530
Subject: [PATCH] rebase: replace MetricsBindAddress with Metrics
Signed-off-by: Riya Singhal <rsinghal@redhat.com>
---
apis/csiaddons/v1alpha1/webhook_suite_test.go | 13 +++++++------
.../v1alpha1/webhook_suite_test.go | 14 ++++++++------
cmd/manager/main.go | 4 +++-
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/apis/csiaddons/v1alpha1/webhook_suite_test.go b/apis/csiaddons/v1alpha1/webhook_suite_test.go
index c58f19805..96d305a63 100644
--- a/apis/csiaddons/v1alpha1/webhook_suite_test.go
+++ b/apis/csiaddons/v1alpha1/webhook_suite_test.go
@@ -37,6 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
+ metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)
// These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -90,12 +91,12 @@ var _ = BeforeSuite(func() {
// start webhook server using Manager
webhookInstallOptions := &testEnv.WebhookInstallOptions
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
- Scheme: scheme,
- Host: webhookInstallOptions.LocalServingHost,
- Port: webhookInstallOptions.LocalServingPort,
- CertDir: webhookInstallOptions.LocalServingCertDir,
- LeaderElection: false,
- MetricsBindAddress: "0",
+ Scheme: scheme,
+ Host: webhookInstallOptions.LocalServingHost,
+ Port: webhookInstallOptions.LocalServingPort,
+ CertDir: webhookInstallOptions.LocalServingCertDir,
+ LeaderElection: false,
+ Metrics: metricsserver.Options{BindAddress: "0"},
})
Expect(err).NotTo(HaveOccurred())
diff --git a/apis/replication.storage/v1alpha1/webhook_suite_test.go b/apis/replication.storage/v1alpha1/webhook_suite_test.go
index 3177011f9..45face253 100644
--- a/apis/replication.storage/v1alpha1/webhook_suite_test.go
+++ b/apis/replication.storage/v1alpha1/webhook_suite_test.go
@@ -29,6 +29,8 @@ import (
. "github.com/onsi/gomega"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
+ metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
//+kubebuilder:scaffold:imports
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
@@ -90,12 +92,12 @@ var _ = BeforeSuite(func() {
// start webhook server using Manager
webhookInstallOptions := &testEnv.WebhookInstallOptions
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
- Scheme: scheme,
- Host: webhookInstallOptions.LocalServingHost,
- Port: webhookInstallOptions.LocalServingPort,
- CertDir: webhookInstallOptions.LocalServingCertDir,
- LeaderElection: false,
- MetricsBindAddress: "0",
+ Scheme: scheme,
+ Host: webhookInstallOptions.LocalServingHost,
+ Port: webhookInstallOptions.LocalServingPort,
+ CertDir: webhookInstallOptions.LocalServingCertDir,
+ LeaderElection: false,
+ Metrics: metricsserver.Options{BindAddress: "0"},
})
Expect(err).NotTo(HaveOccurred())
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 44050924f..c2f4b79c1 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -26,6 +26,8 @@ import (
replicationstoragev1alpha1 "github.com/csi-addons/kubernetes-csi-addons/apis/replication.storage/v1alpha1"
controllers "github.com/csi-addons/kubernetes-csi-addons/controllers/csiaddons"
replicationController "github.com/csi-addons/kubernetes-csi-addons/controllers/replication.storage"
+ metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
"github.com/csi-addons/kubernetes-csi-addons/internal/connection"
"github.com/csi-addons/kubernetes-csi-addons/internal/util"
"github.com/csi-addons/kubernetes-csi-addons/internal/version"
@@ -112,7 +114,7 @@ func main() {
mgr, err := ctrl.NewManager(kubeConfig, ctrl.Options{
Scheme: scheme,
- MetricsBindAddress: metricsAddr,
+ Metrics: metricsserver.Options{BindAddress: metricsAddr},
Port: 9443,
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,