Skip to content

Commit

Permalink
Adapt MetricsBindAddress to Metrics and Namespace to `cache.Def…
Browse files Browse the repository at this point in the history 
…aultNamespaces`
  • Loading branch information
@acumino
acumino committed Sep 14, 2023
1 parent b50cd8f commit 638a8a8
Show file tree
Hide file tree
Showing 69 changed files with 354 additions and 195 deletions.
3 changes: 2 additions & 1 deletion cmd/gardener-admission-controller/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
controllerwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

"github.com/gardener/gardener/pkg/admissioncontroller/apis/config"
Expand Down Expand Up @@ -111,7 +112,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.AdmissionControllerCo
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

LeaderElection: false,

Expand Down
3 changes: 2 additions & 1 deletion cmd/gardener-controller-manager/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/cmd/gardener-controller-manager/app/bootstrappers"
"github.com/gardener/gardener/pkg/api/indexer"
Expand Down Expand Up @@ -127,7 +128,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ControllerManagerConf
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

LeaderElection: cfg.LeaderElection.LeaderElect,
LeaderElectionResourceLock: cfg.LeaderElection.ResourceLock,
Expand Down
3 changes: 2 additions & 1 deletion cmd/gardener-operator/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
controllerwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

"github.com/gardener/gardener/cmd/gardener-operator/app/bootstrappers"
Expand Down Expand Up @@ -127,7 +128,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.OperatorConfiguration
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

LeaderElection: cfg.LeaderElection.LeaderElect,
LeaderElectionResourceLock: cfg.LeaderElection.ResourceLock,
Expand Down
21 changes: 16 additions & 5 deletions cmd/gardener-resource-manager/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ import (
"k8s.io/component-base/version/verflag"
"k8s.io/klog/v2"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/cluster"
controllerconfig "sigs.k8s.io/controller-runtime/pkg/config"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
controllerwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

"github.com/gardener/gardener/cmd/gardener-resource-manager/app/bootstrappers"
Expand Down Expand Up @@ -145,11 +147,9 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
Logger: log,
Scheme: managerScheme,
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),
Namespace: *cfg.SourceClientConnection.Namespace,
SyncPeriod: &cfg.SourceClientConnection.CacheResyncPeriod.Duration,

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

LeaderElection: cfg.LeaderElection.LeaderElect,
LeaderElectionResourceLock: cfg.LeaderElection.ResourceLock,
Expand All @@ -162,6 +162,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
Controller: controllerconfig.Controller{
RecoverPanic: pointer.Bool(true),
},
Cache: getCacheOptions(*cfg.SourceClientConnection.Namespace, cfg.SourceClientConnection.CacheResyncPeriod.Duration),

WebhookServer: controllerwebhook.NewServer(controllerwebhook.Options{
Host: cfg.Server.Webhooks.BindAddress,
Expand Down Expand Up @@ -221,8 +222,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
)
}

opts.Cache.Namespaces = []string{*cfg.TargetClientConnection.Namespace}
opts.SyncPeriod = &cfg.TargetClientConnection.CacheResyncPeriod.Duration
opts.Cache = getCacheOptions(*cfg.TargetClientConnection.Namespace, cfg.TargetClientConnection.CacheResyncPeriod.Duration)

if *cfg.TargetClientConnection.DisableCachedClient {
opts.NewClient = func(config *rest.Config, opts client.Options) (client.Client, error) {
Expand Down Expand Up @@ -292,3 +292,14 @@ func addAllFieldIndexes(ctx context.Context, i client.FieldIndexer) error {

return nil
}

func getCacheOptions(namespace string, syncPeriod time.Duration) cache.Options {
cacheOpts := cache.Options{
SyncPeriod: &syncPeriod,
}

if namespace != "" {
cacheOpts.DefaultNamespaces = map[string]cache.Config{namespace: {}}
}
return cacheOpts
}
3 changes: 2 additions & 1 deletion cmd/gardener-scheduler/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
"github.com/gardener/gardener/pkg/client/kubernetes"
Expand Down Expand Up @@ -121,7 +122,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.SchedulerConfiguratio
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

Cache: cache.Options{
ByObject: map[client.Object]cache.ByObject{
Expand Down
7 changes: 4 additions & 3 deletions cmd/gardenlet/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/cmd/gardenlet/app/bootstrappers"
"github.com/gardener/gardener/pkg/api/indexer"
Expand Down Expand Up @@ -152,7 +153,7 @@ func run(ctx context.Context, cancel context.CancelFunc, log logr.Logger, cfg *c
GracefulShutdownTimeout: pointer.Duration(5 * time.Second),

HealthProbeBindAddress: net.JoinHostPort(cfg.Server.HealthProbes.BindAddress, strconv.Itoa(cfg.Server.HealthProbes.Port)),
MetricsBindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port)),
Metrics: metricsserver.Options{BindAddress: net.JoinHostPort(cfg.Server.Metrics.BindAddress, strconv.Itoa(cfg.Server.Metrics.Port))},

LeaderElection: cfg.LeaderElection.LeaderElect,
LeaderElectionResourceLock: cfg.LeaderElection.ResourceLock,
Expand Down Expand Up @@ -297,11 +298,11 @@ func (g *garden) Start(ctx context.Context) error {
// don't use any selector mechanism here since we want to still fall back to reading secrets with
// the API reader (i.e., not from cache) in case the respective secret is not found in the cache.
&corev1.Secret{}: func(c *rest.Config, o cache.Options) (cache.Cache, error) {
o.Namespaces = []string{seedNamespace}
o.DefaultNamespaces = map[string]cache.Config{seedNamespace: {}}
return cache.New(c, o)
},
&corev1.ServiceAccount{}: func(c *rest.Config, o cache.Options) (cache.Cache, error) {
o.Namespaces = []string{seedNamespace}
o.DefaultNamespaces = map[string]cache.Config{seedNamespace: {}}
return cache.New(c, o)
},
// Gardenlet does not have the required RBAC permissions for listing/watching the following
Expand Down
3 changes: 2 additions & 1 deletion extensions/pkg/controller/cmd/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
controllerconfig "sigs.k8s.io/controller-runtime/pkg/config"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"

extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
Expand Down Expand Up @@ -297,7 +298,7 @@ func (c *ManagerConfig) Apply(opts *manager.Options) {
opts.LeaderElectionResourceLock = c.LeaderElectionResourceLock
opts.LeaderElectionID = c.LeaderElectionID
opts.LeaderElectionNamespace = c.LeaderElectionNamespace
opts.MetricsBindAddress = c.MetricsBindAddress
opts.Metrics = metricsserver.Options{BindAddress: c.MetricsBindAddress}
opts.HealthProbeBindAddress = c.HealthBindAddress
opts.Logger = c.Logger
opts.Controller = controllerconfig.Controller{RecoverPanic: pointer.Bool(true)}
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/kubernetes/cache/single_object.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (s *singleObject) createAndStartCache(log logr.Logger, key client.ObjectKey
}

opts := s.opts()
opts.Namespaces = []string{key.Namespace}
opts.DefaultNamespaces = map[string]cache.Config{key.Namespace: {}}
opts.DefaultFieldSelector = fields.SelectorFromSet(fields.Set{metav1.ObjectNameField: key.Name})
opts.ByObject = nil

Expand Down
10 changes: 7 additions & 3 deletions test/integration/controllermanager/bastion/bastion_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ import (
"k8s.io/client-go/rest"
testclock "k8s.io/utils/clock/testing"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/api/indexer"
"github.com/gardener/gardener/pkg/client/kubernetes"
Expand Down Expand Up @@ -112,9 +114,11 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
},
})
Expect(err).NotTo(HaveOccurred())
mgrClient = mgr.GetClient()
Expand Down
7 changes: 4 additions & 3 deletions ...ation/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/client/kubernetes"
"github.com/gardener/gardener/pkg/controllermanager/apis/config"
Expand Down Expand Up @@ -104,10 +105,10 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
ByObject: map[client.Object]cache.ByObject{
&certificatesv1.CertificateSigningRequest{}: {
Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
Expand Down
7 changes: 4 additions & 3 deletions test/integration/controllermanager/cloudprofile/cloudprofile_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/gardener/gardener/pkg/client/kubernetes"
Expand Down Expand Up @@ -104,10 +105,10 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
ByObject: map[client.Object]cache.ByObject{
&gardencorev1beta1.CloudProfile{}: {
Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
Expand Down
7 changes: 4 additions & 3 deletions test/integration/controllermanager/controllerdeployment/controllerdeployment_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/client/kubernetes"
"github.com/gardener/gardener/pkg/controllermanager/apis/config"
Expand Down Expand Up @@ -108,10 +109,10 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
DefaultLabelSelector: labels.SelectorFromSet(labels.Set{testID: testRunID}),
},
})
Expand Down
5 changes: 3 additions & 2 deletions ...integration/controllermanager/controllerregistration/controllerregistration_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/api/indexer"
"github.com/gardener/gardener/pkg/apis/core"
Expand Down Expand Up @@ -118,8 +119,8 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
ByObject: map[client.Object]cache.ByObject{
&gardencorev1beta1.ControllerRegistration{}: {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
Expand Down
10 changes: 7 additions & 3 deletions test/integration/controllermanager/event/event_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ import (
"k8s.io/client-go/rest"
"k8s.io/utils/clock"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/client/kubernetes"
"github.com/gardener/gardener/pkg/controllermanager/apis/config"
Expand Down Expand Up @@ -101,9 +103,11 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
},
})
Expect(err).NotTo(HaveOccurred())

Expand Down
7 changes: 4 additions & 3 deletions test/integration/controllermanager/exposureclass/exposureclass_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/gardener/gardener/pkg/client/kubernetes"
Expand Down Expand Up @@ -107,10 +108,10 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Namespace: testNamespace.Name,
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
ByObject: map[client.Object]cache.ByObject{
&gardencorev1beta1.ExposureClass{}: {
Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
Expand Down
5 changes: 3 additions & 2 deletions test/integration/controllermanager/managedseedset/managedseedset_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/client/kubernetes"
"github.com/gardener/gardener/pkg/controllermanager/apis/config"
Expand Down Expand Up @@ -103,8 +104,8 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultLabelSelector: labels.SelectorFromSet(labels.Set{testID: testRunID}),
},
Expand Down
5 changes: 3 additions & 2 deletions test/integration/controllermanager/project/activity/activity_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/gardener/gardener/pkg/api/indexer"
"github.com/gardener/gardener/pkg/client/kubernetes"
Expand Down Expand Up @@ -92,8 +93,8 @@ var _ = BeforeSuite(func() {

By("Setup manager")
mgr, err := manager.New(restConfig, manager.Options{
Scheme: kubernetes.GardenScheme,
MetricsBindAddress: "0",
Scheme: kubernetes.GardenScheme,
Metrics: metricsserver.Options{BindAddress: "0"},
Cache: cache.Options{
DefaultLabelSelector: labels.SelectorFromSet(labels.Set{testID: testRunID}),
},
Expand Down

0 comments on commit 638a8a8

Please sign in to comment.