Skip to content

Commit f891dbf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12296 from sbueringer/pr-move-internal-apis
🌱 Move internal/apis to internal/api
2 parents f898bfa + 536265e commit f891dbf

File tree

114 files changed

+95
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+95
-95
lines changed

‎.golangci-kal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ linters:
5353
- zz_generated.*\.go$
5454
- vendored_openapi\.go$
5555
# We don't want to invest time to fix new linter findings in old API types.
56-
- internal/apis/.*
56+
- internal/api/.*
5757
- ".*_test.go" # Exclude test files.
5858
rules:
5959
# KAL should only run on API folders.

‎.golangci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,36 +106,36 @@ linters:
106106
- pkg: sigs.k8s.io/controller-runtime
107107
alias: ctrl
108108
# CABPK
109-
- pkg: sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3
109+
- pkg: sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha3
110110
alias: bootstrapv1alpha3
111-
- pkg: sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4
111+
- pkg: sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha4
112112
alias: bootstrapv1alpha4
113113
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1
114114
alias: bootstrapv1beta1
115115
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
116116
alias: bootstrapv1
117117
# KCP
118-
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3
118+
- pkg: sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha3
119119
alias: controlplanev1alpha3
120-
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha4
120+
- pkg: sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha4
121121
alias: controlplanev1alpha4
122122
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1
123123
alias: controlplanev1beta1
124124
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2
125125
alias: controlplanev1
126126
# CAPI
127-
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3
127+
- pkg: sigs.k8s.io/cluster-api/internal/api/core/v1alpha3
128128
alias: clusterv1alpha3
129-
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4
129+
- pkg: sigs.k8s.io/cluster-api/internal/api/core/v1alpha4
130130
alias: clusterv1alpha4
131131
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
132132
alias: clusterv1beta1
133133
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
134134
alias: clusterv1
135135
# CAPI exp addons
136-
- pkg: sigs.k8s.io/cluster-api/internal/apis/addons/v1alpha3
136+
- pkg: sigs.k8s.io/cluster-api/internal/api/addons/v1alpha3
137137
alias: addonsv1alpha3
138-
- pkg: sigs.k8s.io/cluster-api/internal/apis/addons/v1alpha4
138+
- pkg: sigs.k8s.io/cluster-api/internal/api/addons/v1alpha4
139139
alias: addonsv1alpha4
140140
- pkg: sigs.k8s.io/cluster-api/api/addons/v1beta1
141141
alias: addonsv1beta1
@@ -225,7 +225,7 @@ linters:
225225
paths:
226226
- zz_generated.*\.go$
227227
- vendored_openapi\.go$
228-
- internal/apis/.*
228+
- internal/api/.*
229229
rules:
230230
# Specific exclude rules for deprecated fields that are still part of the codebase. These
231231
# should be removed as the referenced deprecated item is removed from the project.
@@ -402,4 +402,4 @@ formatters:
402402
- zz_generated.*\.go$
403403
- vendored_openapi\.go$
404404
# We don't want to invest time to fix new linter findings in old API types.
405-
- internal/apis/.*
405+
- internal/api/.*

‎Makefile

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
285285
paths=./api/core/... \
286286
paths=./api/ipam/... \
287287
paths=./api/runtime/... \
288-
paths=./internal/apis/core/... \
288+
paths=./internal/api/core/... \
289289
paths=./internal/controllers/... \
290290
paths=./internal/webhooks/... \
291-
paths=./internal/apis/addons/... \
291+
paths=./internal/api/addons/... \
292292
paths=./exp/internal/controllers/... \
293293
paths=./exp/internal/webhooks/... \
294294
paths=./exp/ipam/internal/webhooks/... \
@@ -336,7 +336,7 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
336336
paths=./bootstrap/kubeadm \
337337
paths=./bootstrap/kubeadm/internal/controllers/... \
338338
paths=./bootstrap/kubeadm/internal/webhooks/... \
339-
paths=./internal/apis/bootstrap/kubeadm/... \
339+
paths=./internal/api/bootstrap/kubeadm/... \
340340
crd:crdVersions=v1 \
341341
rbac:roleName=manager-role \
342342
output:crd:dir=./bootstrap/kubeadm/config/crd/bases \
@@ -352,7 +352,7 @@ generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifest
352352
paths=./controlplane/kubeadm \
353353
paths=./controlplane/kubeadm/internal/controllers/... \
354354
paths=./controlplane/kubeadm/internal/webhooks/... \
355-
paths=./internal/apis/controlplane/kubeadm/... \
355+
paths=./internal/api/controlplane/kubeadm/... \
356356
crd:crdVersions=v1 \
357357
rbac:roleName=manager-role \
358358
output:crd:dir=./controlplane/kubeadm/config/crd/bases \
@@ -390,16 +390,16 @@ generate-go-deepcopy: ## Run all generate-go-deepcopy-* targets
390390

391391
.PHONY: generate-go-deepcopy-core
392392
generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
393-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./api/runtime/hooks"
393+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/api/addons,./internal/api/core,./api/runtime/hooks"
394394
$(CONTROLLER_GEN) \
395395
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
396396
paths=./api/addons/... \
397397
paths=./api/core/... \
398398
paths=./api/ipam/... \
399399
paths=./api/runtime/... \
400400
paths=./api/runtime/hooks/... \
401-
paths=./internal/apis/addons/... \
402-
paths=./internal/apis/core/... \
401+
paths=./internal/api/addons/... \
402+
paths=./internal/api/core/... \
403403
paths=./internal/runtime/test/... \
404404
paths=./cmd/clusterctl/... \
405405
paths=./util/test/builder/... \
@@ -413,15 +413,15 @@ generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy g
413413
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
414414
paths=./api/bootstrap/kubeadm/... \
415415
paths=./bootstrap/kubeadm/types/... \
416-
paths=./internal/apis/bootstrap/kubeadm/...
416+
paths=./internal/api/bootstrap/kubeadm/...
417417

418418
.PHONY: generate-go-deepcopy-kubeadm-control-plane
419419
generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm control plane
420420
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/controlplane/kubeadm"
421421
$(CONTROLLER_GEN) \
422422
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
423423
paths=./api/controlplane/kubeadm/... \
424-
paths=./internal/apis/controlplane/kubeadm/...
424+
paths=./internal/api/controlplane/kubeadm/...
425425

426426
.PHONY: generate-go-deepcopy-docker-infrastructure
427427
generate-go-deepcopy-docker-infrastructure: $(CONTROLLER_GEN) generate-go-deepcopy-in-memory-infrastructure ## Generate deepcopy go code for docker infrastructure provider
@@ -454,22 +454,22 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
454454

455455
.PHONY: generate-go-conversions-core-api
456456
generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
457-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
457+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/api/core/v1alpha3,./internal/api/core/v1alpha4"
458458
$(CONVERSION_GEN) \
459459
--output-file=zz_generated.conversion.go \
460460
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
461-
./internal/apis/core/v1alpha3 \
462-
./internal/apis/core/v1alpha4 \
461+
./internal/api/core/v1alpha3 \
462+
./internal/api/core/v1alpha4 \
463463
./api/core/v1beta1
464464

465465
.PHONY: generate-go-conversions-addons-api
466466
generate-go-conversions-addons-api: $(CONVERSION_GEN) ## Generate conversions go code for addons api
467-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/addons/v1beta1,./internal/apis/addons/v1alpha3,./internal/apis/addons/v1alpha4"
467+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/addons/v1beta1,./internal/api/addons/v1alpha3,./internal/api/addons/v1alpha4"
468468
$(CONVERSION_GEN) \
469469
--output-file=zz_generated.conversion.go \
470470
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
471-
./internal/apis/addons/v1alpha3 \
472-
./internal/apis/addons/v1alpha4 \
471+
./internal/api/addons/v1alpha3 \
472+
./internal/api/addons/v1alpha4 \
473473
./api/addons/v1beta1
474474

475475
.PHONY: generate-go-conversions-core-ipam
@@ -497,12 +497,12 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
497497

498498
.PHONY: generate-go-conversions-kubeadm-bootstrap
499499
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
500-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1,./internal/apis/bootstrap/kubeadm"
500+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1,./internal/api/bootstrap/kubeadm"
501501
$(CONVERSION_GEN) \
502502
--output-file=zz_generated.conversion.go \
503503
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
504-
./internal/apis/bootstrap/kubeadm/v1alpha3 \
505-
./internal/apis/bootstrap/kubeadm/v1alpha4 \
504+
./internal/api/bootstrap/kubeadm/v1alpha3 \
505+
./internal/api/bootstrap/kubeadm/v1alpha4 \
506506
./api/bootstrap/kubeadm/v1beta1
507507
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta1,./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
508508
$(CONVERSION_GEN) \
@@ -515,12 +515,12 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
515515

516516
.PHONY: generate-go-conversions-kubeadm-control-plane
517517
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
518-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1,./internal/apis/controlplane/kubeadm"
518+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1,./internal/api/controlplane/kubeadm"
519519
$(CONVERSION_GEN) \
520520
--output-file=zz_generated.conversion.go \
521521
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
522-
./internal/apis/controlplane/kubeadm/v1alpha3 \
523-
./internal/apis/controlplane/kubeadm/v1alpha4 \
522+
./internal/api/controlplane/kubeadm/v1alpha3 \
523+
./internal/api/controlplane/kubeadm/v1alpha4 \
524524
./api/controlplane/kubeadm/v1beta1
525525

526526
.PHONY: generate-go-conversions-docker-infrastructure

‎bootstrap/kubeadm/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import (
5555
"sigs.k8s.io/cluster-api/controllers/crdmigrator"
5656
"sigs.k8s.io/cluster-api/controllers/remote"
5757
"sigs.k8s.io/cluster-api/feature"
58-
bootstrapv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3"
59-
bootstrapv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4"
58+
bootstrapv1alpha3 "sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha3"
59+
bootstrapv1alpha4 "sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha4"
6060
"sigs.k8s.io/cluster-api/util/apiwarnings"
6161
"sigs.k8s.io/cluster-api/util/flags"
6262
"sigs.k8s.io/cluster-api/version"

‎controlplane/kubeadm/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ import (
6060
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
6161
kcpwebhooks "sigs.k8s.io/cluster-api/controlplane/kubeadm/webhooks"
6262
"sigs.k8s.io/cluster-api/feature"
63-
controlplanev1alpha3 "sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3"
64-
controlplanev1alpha4 "sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha4"
63+
controlplanev1alpha3 "sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha3"
64+
controlplanev1alpha4 "sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha4"
6565
"sigs.k8s.io/cluster-api/util/apiwarnings"
6666
"sigs.k8s.io/cluster-api/util/flags"
6767
"sigs.k8s.io/cluster-api/version"

‎internal/apis/addons/v1alpha3/clusterresourceset_types.go renamed to ‎internal/api/addons/v1alpha3/clusterresourceset_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3"
23+
clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3"
2424
)
2525

2626
const (

‎internal/apis/addons/v1alpha3/clusterresourcesetbinding_types.go renamed to ‎internal/api/addons/v1alpha3/clusterresourcesetbinding_types.go

File renamed without changes.

‎internal/apis/addons/v1alpha3/clusterresourcesetbinding_types_test.go renamed to ‎internal/api/addons/v1alpha3/clusterresourcesetbinding_types_test.go

File renamed without changes.

‎internal/apis/addons/v1alpha3/condition_consts.go renamed to ‎internal/api/addons/v1alpha3/condition_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1alpha3
1818

19-
import clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3"
19+
import clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3"
2020

2121
// Conditions and condition Reasons for the ClusterResourceSet object.
2222

‎internal/apis/addons/v1alpha3/conversion.go renamed to ‎internal/api/addons/v1alpha3/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sigs.k8s.io/controller-runtime/pkg/conversion"
2323

2424
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
25-
clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3"
25+
clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/api/core/v1alpha3"
2626
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2727
)
2828

0 commit comments

Comments
 (0)