From 4bd2e42b96f25a8d2e24bbf39db1bc0cab4db1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Wed, 15 Mar 2023 12:36:44 +0100 Subject: [PATCH] chore: remove unused discovery method GetServerVersion (#6577) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché Co-authored-by: shuting --- pkg/clients/dclient/discovery.go | 7 ------- pkg/clients/dclient/fake.go | 5 ----- 2 files changed, 12 deletions(-) diff --git a/pkg/clients/dclient/discovery.go b/pkg/clients/dclient/discovery.go index 2fcbffa114..7ac81c1caa 100644 --- a/pkg/clients/dclient/discovery.go +++ b/pkg/clients/dclient/discovery.go @@ -12,7 +12,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/discovery" ) @@ -41,7 +40,6 @@ type IDiscovery interface { // TODO: there's no mapping from GVK to GVR, this is very error prone GetGVRFromGVK(schema.GroupVersionKind) (schema.GroupVersionResource, error) GetGVKFromGVR(schema.GroupVersionResource) (schema.GroupVersionKind, error) - GetServerVersion() (*version.Info, error) OpenAPISchema() (*openapiv2.Document, error) DiscoveryCache() discovery.CachedDiscoveryInterface DiscoveryInterface() discovery.DiscoveryInterface @@ -103,11 +101,6 @@ func (c serverResources) GetGVRFromGVK(gvk schema.GroupVersionKind) (schema.Grou return gvr, nil } -// GetServerVersion returns the server version of the cluster -func (c serverResources) GetServerVersion() (*version.Info, error) { - return c.cachedClient.ServerVersion() -} - // GetGVKFromGVR returns the Group Version Kind from Group Version Resource. The groupVersion has to be specified properly // for example, for corev1.Pod, the groupVersion has to be specified as `v1`, specifying empty groupVersion won't work. func (c serverResources) GetGVKFromGVR(gvr schema.GroupVersionResource) (schema.GroupVersionKind, error) { diff --git a/pkg/clients/dclient/fake.go b/pkg/clients/dclient/fake.go index 147b400e54..f82a29639c 100644 --- a/pkg/clients/dclient/fake.go +++ b/pkg/clients/dclient/fake.go @@ -9,7 +9,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic/fake" kubefake "k8s.io/client-go/kubernetes/fake" @@ -69,10 +68,6 @@ func (c *fakeDiscoveryClient) getGVR(resource string) (schema.GroupVersionResour return schema.GroupVersionResource{}, errors.New("no found") } -func (c *fakeDiscoveryClient) GetServerVersion() (*version.Info, error) { - return nil, nil -} - func (c *fakeDiscoveryClient) GetGVKFromGVR(schema.GroupVersionResource) (schema.GroupVersionKind, error) { return schema.GroupVersionKind{}, nil }