From 723f144452092e3288759d9d01265a2226d7d3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 6 Oct 2021 11:33:08 +0200 Subject: [PATCH] core: remove unused clientset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing ancient clientset which was not used anywhere any more. Signed-off-by: Sébastien Han --- cmd/rook/rook/rook.go | 4 ---- go.mod | 1 - pkg/clusterd/context.go | 4 ---- 3 files changed, 9 deletions(-) diff --git a/cmd/rook/rook/rook.go b/cmd/rook/rook/rook.go index e2235213f..bc48a7c19 100644 --- a/cmd/rook/rook/rook.go +++ b/cmd/rook/rook/rook.go @@ -34,7 +34,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" v1 "k8s.io/api/core/v1" - apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" @@ -160,9 +159,6 @@ func NewContext() *clusterd.Context { context.DynamicClientset, err = dynamic.NewForConfig(context.KubeConfig) TerminateOnError(err, "failed to create dynamic clientset") - context.APIExtensionClientset, err = apiextensionsclient.NewForConfig(context.KubeConfig) - TerminateOnError(err, "failed to create k8s API extension clientset") - context.RookClientset, err = rookclient.NewForConfig(context.KubeConfig) TerminateOnError(err, "failed to create rook clientset") diff --git a/go.mod b/go.mod index 1b1f40206..513a63988 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,6 @@ require ( gopkg.in/ini.v1 v1.57.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.21.2 - k8s.io/apiextensions-apiserver v0.21.1 k8s.io/apimachinery v0.21.2 k8s.io/client-go v0.21.2 k8s.io/cloud-provider v0.21.1 diff --git a/pkg/clusterd/context.go b/pkg/clusterd/context.go index f8c318478..043a72afa 100644 --- a/pkg/clusterd/context.go +++ b/pkg/clusterd/context.go @@ -22,7 +22,6 @@ import ( rookclient "github.com/rook/rook/pkg/client/clientset/versioned" "github.com/rook/rook/pkg/util/exec" "github.com/rook/rook/pkg/util/sys" - apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -43,9 +42,6 @@ type Context struct { // Represents the Client provided by the controller-runtime package to interact with Kubernetes objects Client client.Client - // APIExtensionClientset is a connection to the API Extension kubernetes API - APIExtensionClientset apiextensionsclient.Interface - // RookClientset is a typed connection to the rook API RookClientset rookclient.Interface