Skip to content

Commit

Permalink
chore(lint): ensures right import alias for k8s apiextensions
Browse files Browse the repository at this point in the history
  • Loading branch information
bartoszmajsak committed Aug 5, 2024
1 parent 14ea7c0 commit 0c647ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]+)
Expand Down
4 changes: 2 additions & 2 deletions controllers/authorization/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 0c647ac

Please sign in to comment.