diff --git a/.golangci.yml b/.golangci.yml index 9a58bad..98f5122 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -59,6 +59,8 @@ linters-settings: # Ensures that i.e. k8s.io/api/rbac/v1 is aliased as rbacv1 - pkg: k8s.io/api/(\w+)/(v[\w\d]+) alias: $1$2 + - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 + alias: apiextv1 - pkg: github.com/(openshift)/api/(\w+)/(v[\w\d]+) alias: $1$2$3 - pkg: github.com/kuadrant/(authorino)/api/(v[\w\d]+) diff --git a/controllers/authorization/suite_test.go b/controllers/authorization/suite_test.go index 1e69875..b3686b2 100644 --- a/controllers/authorization/suite_test.go +++ b/controllers/authorization/suite_test.go @@ -13,7 +13,7 @@ import ( "github.com/opendatahub-io/odh-platform/pkg/spi" "github.com/opendatahub-io/odh-platform/test" "github.com/opendatahub-io/odh-platform/test/k8senvtest" - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -34,7 +34,7 @@ var _ = SynchronizedBeforeSuite(func(ctx context.Context) { testScheme := runtime.NewScheme() pschema.RegisterSchemes(testScheme) - utilruntime.Must(v1.AddToScheme(testScheme)) + utilruntime.Must(apiextv1.AddToScheme(testScheme)) authzCtrl := authorization.NewPlatformAuthorizationReconciler( nil, // SetupWithManager will ensure the client defined for the manager is propagated to the controller under test