From 6c6f4ac14e338ba39c09017c71775d3e4faef8ca Mon Sep 17 00:00:00 2001 From: ary1992 Date: Thu, 22 Jun 2023 12:04:51 +0530 Subject: [PATCH] Remove WithLazyDiscovery, WithLimiter options from apiutil.NewDynamicRESTMapper https://github.com/kubernetes-sigs/controller-runtime/pull/2296/ --- cmd/gardener-resource-manager/app/app.go | 3 --- extensions/pkg/util/shoot_clients.go | 2 +- pkg/client/kubernetes/runtime_client.go | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cmd/gardener-resource-manager/app/app.go b/cmd/gardener-resource-manager/app/app.go index 1fa9962dc5b..52ab939ed8f 100644 --- a/cmd/gardener-resource-manager/app/app.go +++ b/cmd/gardener-resource-manager/app/app.go @@ -27,7 +27,6 @@ import ( "github.com/go-logr/logr" "github.com/spf13/cobra" "github.com/spf13/pflag" - "golang.org/x/time/rate" corev1 "k8s.io/api/core/v1" eventsv1 "k8s.io/api/events/v1" eventsv1beta1 "k8s.io/api/events/v1beta1" @@ -210,8 +209,6 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig return apiutil.NewDynamicRESTMapper( config, httpClient, - apiutil.WithLazyDiscovery, - apiutil.WithLimiter(rate.NewLimiter(rate.Every(1*time.Minute), 1)), // rediscover at maximum every minute ) } diff --git a/extensions/pkg/util/shoot_clients.go b/extensions/pkg/util/shoot_clients.go index 0dbc5de9e5b..98d71308832 100644 --- a/extensions/pkg/util/shoot_clients.go +++ b/extensions/pkg/util/shoot_clients.go @@ -113,7 +113,7 @@ func NewClientForShoot(ctx context.Context, c client.Client, namespace string, o return nil, nil, fmt.Errorf("failed to get HTTP client for config: %w", err) } - mapper, err := apiutil.NewDynamicRESTMapper(shootRESTConfig, httpClient, apiutil.WithLazyDiscovery) + mapper, err := apiutil.NewDynamicRESTMapper(shootRESTConfig, httpClient) if err != nil { return nil, nil, fmt.Errorf("failed to create new DynamicRESTMapper: %w", err) } diff --git a/pkg/client/kubernetes/runtime_client.go b/pkg/client/kubernetes/runtime_client.go index 7137265f232..212a80730bc 100644 --- a/pkg/client/kubernetes/runtime_client.go +++ b/pkg/client/kubernetes/runtime_client.go @@ -19,7 +19,6 @@ import ( "time" "github.com/go-logr/logr" - "golang.org/x/time/rate" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" @@ -65,8 +64,6 @@ func setClientOptionsDefaults(config *rest.Config, options *client.Options) erro mapper, err := apiutil.NewDynamicRESTMapper( config, httpClient, - apiutil.WithLazyDiscovery, - apiutil.WithLimiter(rate.NewLimiter(rate.Every(5*time.Second), 1)), ) if err != nil { return fmt.Errorf("failed to create new DynamicRESTMapper: %w", err)