Skip to content

Commit 21be9a2

Browse files
authored
Merge pull request #12302 from sbueringer/pr-block-int-imports
✨ Block imports to internal packages in our API + restructure import restrictions
2 parents 1edb438 + 0934e28 commit 21be9a2

File tree

15 files changed

+16
-36
lines changed

15 files changed

+16
-36
lines changed

api/.import-restrictions

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
rules:
2+
# Enforce that our APIs do not depend on internal packages.
3+
- selectorRegexp: .*internal.*
4+
allowedPrefixes: []
5+
forbiddenPrefixes: []
6+
# Enforce that our APIs do not depend on CR packages.
7+
# This is overwritten e.g. in packages that require conversion.
8+
- selectorRegexp: sigs[.]k8s[.]io/controller-runtime
9+
allowedPrefixes: []
10+
forbiddenPrefixes:
11+
- "sigs.k8s.io/controller-runtime"

api/addons/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.

api/bootstrap/kubeadm/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.

api/controlplane/kubeadm/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

api/core/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.

api/ipam/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rules:
2+
- selectorRegexp: sigs[.]k8s[.]io/controller-runtime
3+
allowedPrefixes:
4+
- "sigs.k8s.io/controller-runtime/pkg/conversion"
5+
forbiddenPrefixes: []

api/runtime/v1beta2/.import-restrictions

Lines changed: 0 additions & 5 deletions
This file was deleted.

hack/verify-import-restrictions.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ set -o pipefail
2525

2626
sub_packages=(
2727
"api"
28-
"api/addons"
29-
"exp/api"
30-
"bootstrap/kubeadm/api"
3128
"cmd/clusterctl/api"
32-
"controlplane/kubeadm/api"
33-
"api/ipam"
34-
"api/runtime"
3529
"test/extension"
3630
"test/infrastructure/docker/api"
3731
"test/infrastructure/docker/exp/api"

0 commit comments

Comments
 (0)