Skip to content

Commit 6c6f4ac

Browse files
committed
Remove WithLazyDiscovery, WithLimiter options from apiutil.NewDynamicRESTMapper
kubernetes-sigs/controller-runtime#2296
1 parent 2dfb839 commit 6c6f4ac

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

cmd/gardener-resource-manager/app/app.go

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/go-logr/logr"
2828
"github.com/spf13/cobra"
2929
"github.com/spf13/pflag"
30-
"golang.org/x/time/rate"
3130
corev1 "k8s.io/api/core/v1"
3231
eventsv1 "k8s.io/api/events/v1"
3332
eventsv1beta1 "k8s.io/api/events/v1beta1"
@@ -210,8 +209,6 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
210209
return apiutil.NewDynamicRESTMapper(
211210
config,
212211
httpClient,
213-
apiutil.WithLazyDiscovery,
214-
apiutil.WithLimiter(rate.NewLimiter(rate.Every(1*time.Minute), 1)), // rediscover at maximum every minute
215212
)
216213
}
217214

extensions/pkg/util/shoot_clients.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func NewClientForShoot(ctx context.Context, c client.Client, namespace string, o
113113
return nil, nil, fmt.Errorf("failed to get HTTP client for config: %w", err)
114114
}
115115

116-
mapper, err := apiutil.NewDynamicRESTMapper(shootRESTConfig, httpClient, apiutil.WithLazyDiscovery)
116+
mapper, err := apiutil.NewDynamicRESTMapper(shootRESTConfig, httpClient)
117117
if err != nil {
118118
return nil, nil, fmt.Errorf("failed to create new DynamicRESTMapper: %w", err)
119119
}

pkg/client/kubernetes/runtime_client.go

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"time"
2020

2121
"github.com/go-logr/logr"
22-
"golang.org/x/time/rate"
2322
"k8s.io/apimachinery/pkg/runtime"
2423
"k8s.io/apimachinery/pkg/runtime/schema"
2524
"k8s.io/client-go/rest"
@@ -65,8 +64,6 @@ func setClientOptionsDefaults(config *rest.Config, options *client.Options) erro
6564
mapper, err := apiutil.NewDynamicRESTMapper(
6665
config,
6766
httpClient,
68-
apiutil.WithLazyDiscovery,
69-
apiutil.WithLimiter(rate.NewLimiter(rate.Every(5*time.Second), 1)),
7067
)
7168
if err != nil {
7269
return fmt.Errorf("failed to create new DynamicRESTMapper: %w", err)

0 commit comments

Comments
 (0)