Remove kubernetes.Interface.RESTMapper in favor of client.RESTMapper (g…

…ardener#3473)
krgostev · Apr 21, 2022 · ae3d6d0 · ae3d6d0
1 parent 5d64513
commit ae3d6d0
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 42 deletions.
diff --git a/pkg/client/kubernetes/client.go b/pkg/client/kubernetes/client.go
@@ -292,7 +292,6 @@ func newClientSet(conf *Config) (Interface, error) {
 
 	cs := &clientSet{
 		config:     conf.restConfig,
-		restMapper: conf.clientOptions.Mapper,
 		restClient: kubernetes.Discovery().RESTClient(),
 
 		applier: NewApplier(runtimeClient, conf.clientOptions.Mapper),

diff --git a/pkg/client/kubernetes/clientset.go b/pkg/client/kubernetes/clientset.go
@@ -23,7 +23,6 @@ import (
 	"github.com/gardener/gardener/pkg/logger"
 
 	apiextensionclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -41,7 +40,6 @@ import (
 // The version string contains only the major/minor part in the form <major>.<minor>.
 type clientSet struct {
 	config     *rest.Config
-	restMapper meta.RESTMapper
 	restClient rest.Interface
 
 	applier       Applier
@@ -103,11 +101,6 @@ func (c *clientSet) Cache() cache.Cache {
 	return c.cache
 }
 
-// RESTMapper returns the restMapper of this ClientSet.
-func (c *clientSet) RESTMapper() meta.RESTMapper {
-	return c.restMapper
-}
-
 // Kubernetes will return the kubernetes attribute of the Client object.
 func (c *clientSet) Kubernetes() kubernetes.Interface {
 	return c.kubernetes

diff --git a/pkg/client/kubernetes/fake/builder.go b/pkg/client/kubernetes/fake/builder.go
@@ -159,7 +159,6 @@ func (b *ClientSetBuilder) Build() *ClientSet {
 		client:                b.client,
 		directClient:          b.directClient,
 		cache:                 b.cache,
-		restMapper:            b.restMapper,
 		kubernetes:            b.kubernetes,
 		gardenCore:            b.gardenCore,
 		apiextension:          b.apiextension,

diff --git a/pkg/client/kubernetes/fake/clientset.go b/pkg/client/kubernetes/fake/clientset.go
@@ -22,7 +22,6 @@ import (
 	"github.com/gardener/gardener/pkg/client/kubernetes"
 
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/version"
 	kubernetesclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -44,7 +43,6 @@ type ClientSet struct {
 	client          client.Client
 	directClient    client.Client
 	cache           cache.Cache
-	restMapper      meta.RESTMapper
 	kubernetes      kubernetesclientset.Interface
 	gardenCore      gardencoreclientset.Interface
 	apiextension    apiextensionsclientset.Interface
@@ -94,11 +92,6 @@ func (c *ClientSet) Cache() cache.Cache {
 	return c.cache
 }
 
-// RESTMapper returns the restMapper of this ClientSet.
-func (c *ClientSet) RESTMapper() meta.RESTMapper {
-	return c.restMapper
-}
-
 // Kubernetes will return the kubernetes attribute of the Client object.
 func (c *ClientSet) Kubernetes() kubernetesclientset.Interface {
 	return c.kubernetes

diff --git a/pkg/client/kubernetes/fake/fake_test.go b/pkg/client/kubernetes/fake/fake_test.go
@@ -22,7 +22,6 @@ import (
 	gardencorefake "github.com/gardener/gardener/pkg/client/core/clientset/versioned/fake"
 	"github.com/gardener/gardener/pkg/client/kubernetes/fake"
 	"github.com/gardener/gardener/pkg/client/kubernetes/test"
-	"github.com/gardener/gardener/pkg/mock/apimachinery/api/meta"
 	mockdiscovery "github.com/gardener/gardener/pkg/mock/client-go/discovery"
 	mockcache "github.com/gardener/gardener/pkg/mock/controller-runtime/cache"
 	mockclient "github.com/gardener/gardener/pkg/mock/controller-runtime/client"
@@ -103,13 +102,6 @@ var _ = Describe("Fake ClientSet", func() {
 		Expect(cs.Cache()).To(BeIdenticalTo(cache))
 	})
 
-	It("should correctly set restMapper attribute", func() {
-		restMapper := meta.NewMockRESTMapper(ctrl)
-		cs := builder.WithRESTMapper(restMapper).Build()
-
-		Expect(cs.RESTMapper()).To(BeIdenticalTo(restMapper))
-	})
-
 	It("should correctly set kubernetes attribute", func() {
 		kubernetes := kubernetesfake.NewSimpleClientset()
 		cs := builder.WithKubernetes(kubernetes).Build()

diff --git a/pkg/client/kubernetes/types.go b/pkg/client/kubernetes/types.go
@@ -28,7 +28,6 @@ import (
 	hvpav1alpha1 "github.com/gardener/hvpa-controller/api/v1alpha1"
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -136,7 +135,6 @@ type Applier interface {
 // of several Kubernetes versions.
 type Interface interface {
 	RESTConfig() *rest.Config
-	RESTMapper() meta.RESTMapper
 	RESTClient() rest.Interface
 
 	// Client returns the ClientSet's controller-runtime client. This client should be used by default, as it carries

diff --git a/pkg/mock/gardener/client/kubernetes/mocks.go b/pkg/mock/gardener/client/kubernetes/mocks.go
diff --git a/pkg/operation/seed/seed.go b/pkg/operation/seed/seed.go
@@ -243,7 +243,7 @@ func BootstrapCluster(ctx context.Context, k8sGardenClient, k8sSeedClient kubern
 	vpaEnabled := seed.Info.Spec.Settings == nil || seed.Info.Spec.Settings.VerticalPodAutoscaler == nil || seed.Info.Spec.Settings.VerticalPodAutoscaler.Enabled
 	if !vpaEnabled {
 		// VPA is a prerequisite. If it's not enabled via the seed spec it must be provided through some other mechanism.
-		if _, err := k8sSeedClient.RESTMapper().RESTMapping(vpaGK); err != nil {
+		if _, err := k8sSeedClient.Client().RESTMapper().RESTMapping(vpaGK); err != nil {
 			return fmt.Errorf("VPA is required for seed cluster: %s", err)
 		}