Address PR review feedback

gardener · Feb 28, 2024 · 7bf6801 · 7bf6801
1 parent 7a50517
commit 7bf6801
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/cmd/gardener-resource-manager/app/app.go b/cmd/gardener-resource-manager/app/app.go
@@ -29,7 +29,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	eventsv1 "k8s.io/api/events/v1"
 	eventsv1beta1 "k8s.io/api/events/v1beta1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	kubernetesclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/component-base/version/verflag"
@@ -187,12 +186,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
 
 			// use dynamic rest mapper for target cluster, which will automatically rediscover resources on NoMatchErrors
 			// but is rate-limited to not issue to many discovery calls (rate-limit shared across all reconciliations)
-			opts.MapperProvider = func(config *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
-				return apiutil.NewDynamicRESTMapper(
-					config,
-					httpClient,
-				)
-			}
+			opts.MapperProvider = apiutil.NewDynamicRESTMapper
 
 			opts.Cache.DefaultNamespaces = getCacheConfig(cfg.TargetClientConnection.Namespaces)
 			opts.Cache.SyncPeriod = &cfg.TargetClientConnection.CacheResyncPeriod.Duration

diff --git a/cmd/gardenlet/app/app.go b/cmd/gardenlet/app/app.go
@@ -169,13 +169,7 @@ func run(ctx context.Context, cancel context.CancelFunc, log logr.Logger, cfg *c
 			RecoverPanic: ptr.To(true),
 		},
 
-		MapperProvider: func(config *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
-			return apiutil.NewDynamicRESTMapper(
-				config,
-				httpClient,
-			)
-		},
-
+		MapperProvider: apiutil.NewDynamicRESTMapper,
 		Client: client.Options{
 			Cache: &client.CacheOptions{
 				DisableFor: []client.Object{
@@ -340,12 +334,7 @@ func (g *garden) Start(ctx context.Context) error {
 			}, nil
 		}
 
-		opts.MapperProvider = func(config *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
-			return apiutil.NewDynamicRESTMapper(
-				config,
-				httpClient,
-			)
-		}
+		opts.MapperProvider = apiutil.NewDynamicRESTMapper
 	})
 	if err != nil {
 		return fmt.Errorf("failed creating garden cluster object: %w", err)

diff --git a/pkg/client/kubernetes/cache/single_object.go b/pkg/client/kubernetes/cache/single_object.go
@@ -148,8 +148,12 @@ func (s *singleObject) GetInformer(ctx context.Context, obj client.Object, opts
 	return cache.GetInformer(ctx, obj, opts...)
 }
 
-func (s *singleObject) RemoveInformer(_ context.Context, _ client.Object) error {
-	return nil
+func (s *singleObject) RemoveInformer(ctx context.Context, obj client.Object) error {
+	cache, err := s.getOrCreateCache(client.ObjectKeyFromObject(obj))
+	if err != nil {
+		return err
+	}
+	return cache.RemoveInformer(ctx, obj)
 }
 
 func (s *singleObject) IndexField(ctx context.Context, obj client.Object, field string, extractValue client.IndexerFunc) error {

diff --git a/test/integration/gardenlet/seed/care/care_test.go b/test/integration/gardenlet/seed/care/care_test.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
@@ -80,6 +81,7 @@ var _ = Describe("Seed Care controller tests", func() {
 					},
 				},
 			},
+			MapperProvider: apiutil.NewDynamicRESTMapper,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		mgrClient = mgr.GetClient()

diff --git a/test/integration/resourcemanager/health/health_suite_test.go b/test/integration/resourcemanager/health/health_suite_test.go
@@ -16,7 +16,6 @@ package health_test
 
 import (
 	"context"
-	"net/http"
 	"path/filepath"
 	"testing"
 	"time"
@@ -25,7 +24,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/utils/ptr"
@@ -118,9 +116,7 @@ var _ = BeforeSuite(func() {
 		Cache: cache.Options{
 			DefaultNamespaces: map[string]cache.Config{testNamespace.Name: {}},
 		},
-		MapperProvider: func(config *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
-			return apiutil.NewDynamicRESTMapper(config, httpClient)
-		},
+		MapperProvider: apiutil.NewDynamicRESTMapper,
 	})
 	Expect(err).NotTo(HaveOccurred())