Introduce staticcheck linter for deprecations

Makefile

@@ -42,6 +42,10 @@ GOLANGCI_LINT_VER := v1.47.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
+STATICCHECK_VER := 2022.1
+STATICCHECK_BIN := staticcheck
+STATICCHECK := $(TOOLS_GOBIN_DIR)/$(STATICCHECK_BIN)-$(STATICCHECK_VER)
+
 GOTESTSUM_VER := v1.8.1
 GOTESTSUM_BIN := gotestsum
 GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)
@@ -103,8 +107,13 @@ install:
 $(GOLANGCI_LINT):
 	GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
 
-lint: $(GOLANGCI_LINT)
+$(STATICCHECK):
+	GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) honnef.co/go/tools/cmd/staticcheck $(STATICCHECK_BIN) $(STATICCHECK_VER)
+
+lint: $(GOLANGCI_LINT) $(STATICCHECK)
 	$(GOLANGCI_LINT) run --timeout=10m ./...
+	$(STATICCHECK) -checks ST1019,ST1005 ./...
+
 .PHONY: lint
 
 vendor: ## Vendor the dependencies

cmd/sharded-test-server/frontproxy.go

@@ -65,7 +65,7 @@ func startFrontProxy(ctx context.Context, args []string, servingCA *crypto.CA, h
   proxy_client_cert: .kcp-front-proxy/requestheader.crt
   proxy_client_key: .kcp-front-proxy/requestheader.key
 `), 0644); err != nil {
-		return fmt.Errorf("failed to create front-proxy mapping.yaml: %w\n", err)
+		return fmt.Errorf("failed to create front-proxy mapping.yaml: %w", err)
 	}
 
 	// write root shard kubeconfig
@@ -87,10 +87,10 @@ func startFrontProxy(ctx context.Context, args []string, servingCA *crypto.CA, h
 	klog.Infof("Creating kcp-front-proxy serving cert with hostnames %v", hostnames)
 	cert, err := servingCA.MakeServerCert(hostnames, 365)
 	if err != nil {
-		return fmt.Errorf("failed to create server cert: %w\n", err)
+		return fmt.Errorf("failed to create server cert: %w", err)
 	}
 	if err := cert.WriteCertConfigFile(filepath.Join(workDirPath, ".kcp-front-proxy/apiserver.crt"), filepath.Join(workDirPath, ".kcp-front-proxy/apiserver.key")); err != nil {
-		return fmt.Errorf("failed to write server cert: %w\n", err)
+		return fmt.Errorf("failed to write server cert: %w", err)
 	}
 
 	// run front-proxy command

cmd/sharded-test-server/third_party/library-go/crypto/crypto.go

@@ -408,7 +408,7 @@ func GetTLSCertificateConfig(certFile, keyFile string) (*TLSCertificateConfig, e
 	}
 	certs, err := cert.ParseCertsPEM(certPEMBlock)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading %s: %s", certFile, err)
+		return nil, fmt.Errorf("error reading %s: %s", certFile, err)
 	}
 
 	keyPEMBlock, err := ioutil.ReadFile(keyFile)
@@ -434,7 +434,7 @@ func GetTLSCertificateConfigFromBytes(certBytes, keyBytes []byte) (*TLSCertifica
 
 	certs, err := cert.ParseCertsPEM(certBytes)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading cert: %s", err)
+		return nil, fmt.Errorf("error reading cert: %s", err)
 	}
 
 	keyPairCert, err := tls.X509KeyPair(certBytes, keyBytes)
@@ -733,7 +733,7 @@ func GetServerCert(certFile, keyFile string, hostnames sets.String) (*TLSCertifi
 		return server, nil
 	}
 
-	return nil, fmt.Errorf("Existing server certificate in %s was missing some hostnames (%v) or IP addresses (%v).", certFile, missingDns, missingIps)
+	return nil, fmt.Errorf("existing server certificate in %s was missing some hostnames (%v) or IP addresses (%v)", certFile, missingDns, missingIps)
 }
 
 func (ca *CA) MakeAndWriteServerCert(certFile, keyFile string, hostnames sets.String, expireDays int) (*TLSCertificateConfig, error) {
@@ -1045,7 +1045,7 @@ func CertsFromPEM(pemCerts []byte) ([]*x509.Certificate, error) {
 	}
 
 	if !ok {
-		return certs, errors.New("Could not read any certificates")
+		return certs, errors.New("could not read any certificates")
 	}
 	return certs, nil
 }
@@ -1099,7 +1099,7 @@ func signCertificate(template *x509.Certificate, requestKey crypto.PublicKey, is
 		return nil, err
 	}
 	if len(certs) != 1 {
-		return nil, errors.New("Expected a single certificate")
+		return nil, errors.New("expected a single certificate")
 	}
 	return certs[0], nil
 }
@@ -1129,7 +1129,7 @@ func encodeKey(key crypto.PrivateKey) ([]byte, error) {
 			return []byte{}, err
 		}
 	default:
-		return []byte{}, errors.New("Unrecognized key type")
+		return []byte{}, errors.New("unrecognized key type")
 
 	}
 	return b.Bytes(), nil

pkg/authorization/apibinding_authorizer.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"
 
-	"github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1"
 	apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1"
 	kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions"
 	rbacwrapper "github.com/kcp-dev/kcp/pkg/virtual/framework/wrappers/rbac"
@@ -176,14 +175,14 @@ func (a *apiBindingAccessAuthorizer) getAPIBindingReference(attr authorizer.Attr
 	return nil, false, nil
 }
 
-func (a *apiBindingAccessAuthorizer) getAPIExport(exportRef *apisv1alpha1.ExportReference) (*v1alpha1.APIExport, bool, error) {
+func (a *apiBindingAccessAuthorizer) getAPIExport(exportRef *apisv1alpha1.ExportReference) (*apisv1alpha1.APIExport, bool, error) {
 	objs, err := a.apiExportIndexer.ByIndex(byWorkspaceIndex, exportRef.Workspace.Path)
 	if err != nil {
 		return nil, false, err
 	}
 
 	for _, obj := range objs {
-		apiExport := obj.(*v1alpha1.APIExport)
+		apiExport := obj.(*apisv1alpha1.APIExport)
 		if apiExport.Name == exportRef.Workspace.ExportName {
 			return apiExport, true, err
 		}

pkg/crdpuller/discovery.go

@@ -494,7 +494,7 @@ func (sc *SchemaConverter) VisitKind(k *proto.Kind) {
 func (sc *SchemaConverter) VisitReference(r proto.Reference) {
 	reference := r.Reference()
 	if sc.visited.Has(reference) {
-		*sc.errors = append(*sc.errors, fmt.Errorf("Recursive schema are not supported: %s", reference))
+		*sc.errors = append(*sc.errors, fmt.Errorf("recursive schema are not supported: %s", reference))
 		return
 	}
 	if knownSchema, schemaIsKnown := knownSchemas[reference]; schemaIsKnown {

pkg/localenvoy/controlplane/controlplane.go

@@ -28,7 +28,6 @@ import (
 	listener "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3"
 	route "github.com/envoyproxy/go-control-plane/envoy/service/route/v3"
 	cachetypes "github.com/envoyproxy/go-control-plane/pkg/cache/types"
-	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	envoycachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
 	xds "github.com/envoyproxy/go-control-plane/pkg/server/v3"
@@ -68,13 +67,13 @@ type EnvoyControlPlane struct {
 	ingressLister  v1.IngressLister
 	translator     *translator
 	managementPort uint
-	snapshotCache  cache.SnapshotCache
+	snapshotCache  envoycachev3.SnapshotCache
 	callbacks      xds.Callbacks
 }
 
 // NewEnvoyControlPlane creates a new EnvoyControlPlane instance.
 func NewEnvoyControlPlane(managementPort, envoyListenPort uint, ingressLister v1.IngressLister, callbacks xds.Callbacks) *EnvoyControlPlane {
-	snapshotCache := cache.NewSnapshotCache(true, cache.IDHash{}, nil)
+	snapshotCache := envoycachev3.NewSnapshotCache(true, envoycachev3.IDHash{}, nil)
 
 	ecp := EnvoyControlPlane{
 		managementPort: managementPort,

pkg/reconciler/tenancy/clusterworkspace/clusterworkspace_controller.go

@@ -302,7 +302,7 @@ func (c *Controller) patchIfNeeded(ctx context.Context, old, obj *tenancyv1alpha
 
 	if specOrObjectMetaChanged && statusChanged {
 		// enqueue again to take care of the spec change, assuming the patch did nothing
-		return fmt.Errorf("Programmer error: spec and status changed in same reconcile iteration:\n%s", cmp.Diff(old, obj))
+		return fmt.Errorf("programmer error: spec and status changed in same reconcile iteration:\n%s", cmp.Diff(old, obj))
 	}
 
 	return nil

pkg/reconciler/workload/apiexport/apiresourceschema.go

@@ -21,12 +21,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1"
 	apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1"
 	apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1"
 )
 
-func toAPIResourceSchema(r *v1alpha1.NegotiatedAPIResource, name string) *apisv1alpha1.APIResourceSchema {
+func toAPIResourceSchema(r *apiresourcev1alpha1.NegotiatedAPIResource, name string) *apisv1alpha1.APIResourceSchema {
 	group := r.Spec.CommonAPIResourceSpec.GroupVersion.Group
 	if group == "core" {
 		group = ""

pkg/reconciler/workload/deploymentsplitter/deploymentsplitter_reconcile.go

@@ -88,7 +88,7 @@ func (c *Controller) reconcile(ctx context.Context, deployment *appsv1.Deploymen
 			return err
 		}
 		if !exists {
-			return fmt.Errorf("Root deployment not found: %s", rootDeploymentName)
+			return fmt.Errorf("root deployment not found: %s", rootDeploymentName)
 		}
 
 		rootDeployment = rootIf.(*appsv1.Deployment)

pkg/server/options/options.go

@@ -36,7 +36,6 @@ import (
 
 	kcpadmission "github.com/kcp-dev/kcp/pkg/admission"
 	etcdoptions "github.com/kcp-dev/kcp/pkg/embeddedetcd/options"
-	_ "github.com/kcp-dev/kcp/pkg/features"
 	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	"github.com/kcp-dev/kcp/pkg/server/options/batteries"
 )

pkg/syncer/spec/spec_process_test.go

@@ -38,7 +38,6 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/dynamic/dynamicinformer"
-	"k8s.io/client-go/dynamic/fake"
 	dynamicfake "k8s.io/client-go/dynamic/fake"
 	clienttesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/clusters"
@@ -451,7 +450,7 @@ func TestDeepEqualApartFromStatus(t *testing.T) {
 var _ dynamic.ClusterInterface = (*mockedDynamicCluster)(nil)
 
 type mockedDynamicCluster struct {
-	client *fake.FakeDynamicClient
+	client *dynamicfake.FakeDynamicClient
 }
 
 func (mdc *mockedDynamicCluster) Cluster(name logicalcluster.Name) dynamic.Interface {

pkg/syncer/status/status_process_test.go

@@ -36,7 +36,6 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/dynamic/dynamicinformer"
-	"k8s.io/client-go/dynamic/fake"
 	dynamicfake "k8s.io/client-go/dynamic/fake"
 	clienttesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
@@ -293,7 +292,7 @@ func TestDeepEqualFinalizersAndStatus(t *testing.T) {
 var _ dynamic.ClusterInterface = (*mockedDynamicCluster)(nil)
 
 type mockedDynamicCluster struct {
-	client *fake.FakeDynamicClient
+	client *dynamicfake.FakeDynamicClient
 }
 
 func (mdc *mockedDynamicCluster) Cluster(name logicalcluster.Name) dynamic.Interface {

pkg/virtual/framework/authorization/authorizer.go

@@ -52,5 +52,5 @@ func (a *virtualWorkspaceAuthorizer) Authorize(ctx context.Context, attrs author
 
 	// This should never happen if a virtual workspace name has been set in the context by the
 	// ResolveRootPath method of one of the virtual workspaces.
-	return authorizer.DecisionNoOpinion, "", fmt.Errorf("Virtual Workspace %q not found", virtualWorkspaceName)
+	return authorizer.DecisionNoOpinion, "", fmt.Errorf("virtual Workspace %q not found", virtualWorkspaceName)
 }

pkg/virtual/framework/fixedgvs/apiserver/apiserver.go

@@ -29,7 +29,6 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/endpoints/discovery"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/registry/rest"
 	restStorage "k8s.io/apiserver/pkg/registry/rest"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 
@@ -119,7 +118,7 @@ func (c completedConfig) New(virtualWorkspaceName string, groupManager discovery
 
 	codecs := serializer.NewCodecFactory(scheme)
 
-	storage := map[string]rest.Storage{}
+	storage := map[string]restStorage.Storage{}
 	for resource, storageBuilder := range c.ExtraConfig.StorageBuilders {
 		restStorage, err := storageBuilder(c.GenericConfig)
 		if err != nil {

pkg/virtual/framework/forwardingregistry/rest_test.go

@@ -36,7 +36,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -252,7 +251,7 @@ func TestWatch(t *testing.T) {
 	ctx := request.WithNamespace(context.Background(), "default")
 	ctx = request.WithCluster(ctx, request.Cluster{Name: logicalcluster.New("foo")})
 
-	watchedError := &v1.Status{
+	watchedError := &metav1.Status{
 		Status:  "Failure",
 		Message: "message",
 	}
@@ -296,7 +295,7 @@ func TestWildcardWatchWithPIExportIdentity(t *testing.T) {
 	ctx := request.WithNamespace(context.Background(), "default")
 	ctx = request.WithCluster(ctx, request.Cluster{Name: logicalcluster.Wildcard, Wildcard: true})
 
-	watchedError := &v1.Status{
+	watchedError := &metav1.Status{
 		Status:  "Failure",
 		Message: "message",
 	}

test/e2e/conformance/cross_logical_cluster_list_test.go

@@ -40,7 +40,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	configcrds "github.com/kcp-dev/kcp/config/crds"
-	tenancyapi "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned"
 	"github.com/kcp-dev/kcp/pkg/indexers"
@@ -66,16 +65,16 @@ func TestCrossLogicalClusterList(t *testing.T) {
 
 	// Note: we put all consumer workspaces onto root shard in order to enforce conflicts.
 	logicalClusters := []logicalcluster.Name{
-		framework.NewOrganizationFixture(t, server, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"})),
-		framework.NewOrganizationFixture(t, server, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"})),
+		framework.NewOrganizationFixture(t, server, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"})),
+		framework.NewOrganizationFixture(t, server, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"})),
 	}
 	expectedWorkspaces := sets.NewString()
 	for i, lcluster := range logicalClusters {
 		wsName := fmt.Sprintf("ws-%d", i)
 
 		clustername := lcluster
 		t.Logf("Creating ClusterWorkspace CRs in logical cluster %s", lcluster)
-		sourceWorkspace := &tenancyapi.ClusterWorkspace{
+		sourceWorkspace := &tenancyv1alpha1.ClusterWorkspace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: wsName,
 			},
@@ -91,7 +90,7 @@ func TestCrossLogicalClusterList(t *testing.T) {
 	}
 
 	t.Logf("Listing ClusterWorkspace CRs across logical clusters with identity")
-	tenancyExport, err := kcpClusterClient.ApisV1alpha1().APIExports().Get(logicalcluster.WithCluster(ctx, tenancyapi.RootCluster), "tenancy.kcp.dev", metav1.GetOptions{})
+	tenancyExport, err := kcpClusterClient.ApisV1alpha1().APIExports().Get(logicalcluster.WithCluster(ctx, tenancyv1alpha1.RootCluster), "tenancy.kcp.dev", metav1.GetOptions{})
 	require.NoError(t, err, "error getting tenancy API export")
 	require.NotEmptyf(t, tenancyExport.Status.IdentityHash, "tenancy API export has no identity hash")
 	dynamicClusterClient, err := kcpdynamic.NewClusterDynamicClientForConfig(rootShardCfg)
@@ -134,11 +133,11 @@ func TestCRDCrossLogicalClusterListPartialObjectMetadata(t *testing.T) {
 	// Note: we put all consumer workspaces onto root shard in order to enforce conflicts.
 
 	// These 2 workspaces will have the same sheriffs CRD schema as normal CRDs
-	wsNormalCRD1a := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
-	wsNormalCRD1b := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
+	wsNormalCRD1a := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
+	wsNormalCRD1b := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
 
 	// This workspace will have a different sherrifs CRD schema as a normal CRD - will conflict with 1a/1b.
-	wsNormalCRD2 := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
+	wsNormalCRD2 := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
 
 	// These 2 workspaces will export a sheriffs API with the same schema
 	wsExport1a := framework.NewWorkspaceFixture(t, server, org)
@@ -148,13 +147,13 @@ func TestCRDCrossLogicalClusterListPartialObjectMetadata(t *testing.T) {
 	wsExport2 := framework.NewWorkspaceFixture(t, server, org)
 
 	// This workspace will consume from wsExport1a
-	wsConsume1a := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
+	wsConsume1a := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
 
 	// This workspace will consume from wsExport1b
-	wsConsume1b := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
+	wsConsume1b := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
 
 	// This workspace will consume from wsExport2
-	wsConsume2 := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyapi.ShardConstraints{Name: "root"}))
+	wsConsume2 := framework.NewWorkspaceFixture(t, server, org, framework.WithShardConstraints(tenancyv1alpha1.ShardConstraints{Name: "root"}))
 
 	cfg := server.BaseConfig(t)
 	rootShardConfig := server.RootShardSystemMasterBaseConfig(t)

test/e2e/framework/config.go

@@ -70,7 +70,7 @@ func (c *testConfig) PClusterKubeconfig() string {
 func (c *testConfig) KCPKubeconfig() string {
 	// TODO(marun) How to validate before use given that the testing package is calling flags.Parse()?
 	if c.useDefaultKCPServer && len(c.kcpKubeconfig) > 0 {
-		panic(errors.New("Only one of --use-default-kcp-server and --kcp-kubeconfig should be set."))
+		panic(errors.New("only one of --use-default-kcp-server and --kcp-kubeconfig should be set"))
 	}
 
 	if c.useDefaultKCPServer {

test/e2e/framework/syncer.go

@@ -38,7 +38,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/kubernetes"
 	kubernetesclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -334,7 +333,7 @@ type StartedSyncerFixture struct {
 	// Provide cluster-admin config and client for test purposes. The downstream config in
 	// SyncerConfig will be less privileged.
 	DownstreamConfig     *rest.Config
-	DownstreamKubeClient kubernetes.Interface
+	DownstreamKubeClient kubernetesclientset.Interface
 }
 
 // WaitForClusterReady waits for the cluster to be ready with the given reason.

test/e2e/reconciler/clusterworkspace/controller_test.go

@@ -35,7 +35,6 @@ import (
 
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1"
 	utilconditions "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions"
-	clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned"
 	kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned"
 	"github.com/kcp-dev/kcp/test/e2e/framework"
 )
@@ -45,7 +44,7 @@ func TestWorkspaceController(t *testing.T) {
 
 	type runningServer struct {
 		framework.RunningServer
-		rootKcpClient, orgKcpClient clientset.Interface
+		rootKcpClient, orgKcpClient kcpclientset.Interface
 		orgExpect                   framework.RegisterClusterWorkspaceExpectation
 		rootExpectShard             framework.RegisterWorkspaceShardExpectation
 	}