Skip to content

Commit 70d67eb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12262 from sbueringer/pr-move-apis
⚠️ Move APIs to ./api
2 parents a8e4187 + 19d5987 commit 70d67eb

File tree

760 files changed

+5087
-5403
lines changed

Some content is hidden

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

760 files changed

+5087
-5403
lines changed

‎.golangci-kal.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,53 +60,53 @@ linters:
6060
- path-except: "api//*"
6161
linters:
6262
- kubeapilinter
63-
- path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
63+
- path: "api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/ipam/v1beta2/*|api/runtime/v1beta2/*|api/addons/v1beta1/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/core/v1beta1/*|api/ipam/v1beta1/*|api/ipam/v1alpha1/*|api/runtime/v1alpha1/*"
6464
text: "Conditions field must be a slice of metav1.Condition"
6565
linters:
6666
- kubeapilinter
67-
- path: "api/v1beta1/*"
67+
- path: "api/core/v1beta1/*"
6868
text: "type ClusterIPFamily should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
6969
linters:
7070
- kubeapilinter
71-
- path: "exp/ipam/api/v1beta2/*|exp/ipam/api/v1alpha1/*|exp/ipam/api/v1beta1/*"
71+
- path: "api/ipam/v1beta2/*|api/ipam/v1alpha1/*|api/ipam/v1beta1/*"
7272
text: "field Prefix should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
7373
linters:
7474
- kubeapilinter
7575
# clusterctl and Runtime Hooks can be fixed once we bump their apiVersion.
76-
- path: "cmd/clusterctl/api/v1alpha3|exp/runtime/hooks/api/v1alpha1"
76+
- path: "cmd/clusterctl/api/v1alpha3|api/runtime/hooks/v1alpha1"
7777
text: "maxlength"
7878
linters:
7979
- kubeapilinter
8080
# controller-gen does not allow to add MaxItems to Schemaless fields
81-
- path: "api/v1beta2/*|api/v1beta1/*"
81+
- path: "api/core/v1beta2/*|api/core/v1beta1/*"
8282
text: "maxlength: field (AllOf|OneOf|AnyOf) must have a maximum items, add kubebuilder:validation:MaxItems marker"
8383
linters:
8484
- kubeapilinter
8585
# It does not make sense to add a maxItems marker on the *List structs as they are not used to generate CRD YAMLs.
8686
# This exclude will be removed once https://github.com/JoelSpeed/kubeapilinter/issues/38 is resolved.
87-
- path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
87+
- path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/core/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
8888
text: "maxlength: field Items must have a maximum items, add kubebuilder:validation:MaxItems marker"
8989
linters:
9090
- kubeapilinter
91-
- path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/v1beta1/*|api/addons/v1beta1/*"
91+
- path: "api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/v1alpha1/*|api/core/v1beta1/*|api/addons/v1beta1/*"
9292
text: "nobools"
9393
linters:
9494
- kubeapilinter
9595
# We follow the current CustomResourceDefinition field's json tag pattern.
96-
- path: "api/v1beta2/*|api/v1beta1/*"
96+
- path: "api/core/v1beta2/*|api/core/v1beta1/*"
9797
text: "field (XPreserveUnknownFields|XPreserveUnknownFields|XValidations|XMetadata|XIntOrString) json tag does not match pattern"
9898
linters:
9999
- kubeapilinter
100100
# The following rules are disabled until we migrate to the new API.
101-
- path: "bootstrap/kubeadm/api/v1beta2/kubeadm_types.go|bootstrap/kubeadm/api/v1beta1/kubeadm_types.go"
101+
- path: "api/bootstrap/kubeadm/v1beta2/kubeadm_types.go|api/bootstrap/kubeadm/v1beta1/kubeadm_types.go"
102102
text: "field Token is marked as required, should not be a pointer"
103103
linters:
104104
- kubeapilinter
105-
- path: "api/v1beta2/clusterclass_types.go|api/v1beta1/clusterclass_types.go"
105+
- path: "api/core/v1beta2/clusterclass_types.go|api/core/v1beta1/clusterclass_types.go"
106106
text: "field Ref is marked as required, should not be a pointer"
107107
linters:
108108
- kubeapilinter
109-
- path: "api/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*"
109+
- path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/core/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*|api/runtime/v1beta2/*|api/runtime/v1alpha1/*|api/runtime/hooks/v1alpha1/*"
110110
text: "field Items must be marked as optional or required"
111111
linters:
112112
- kubeapilinter

‎.golangci.yml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,37 +110,28 @@ linters:
110110
alias: bootstrapv1alpha3
111111
- pkg: sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4
112112
alias: bootstrapv1alpha4
113-
- pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
113+
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1
114114
alias: bootstrapv1beta1
115-
- pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2
115+
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
116116
alias: bootstrapv1
117117
# KCP
118118
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3
119119
alias: controlplanev1alpha3
120120
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha4
121121
alias: controlplanev1alpha4
122-
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
122+
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1
123123
alias: controlplanev1beta1
124-
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2
124+
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2
125125
alias: controlplanev1
126126
# CAPI
127127
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3
128128
alias: clusterv1alpha3
129129
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4
130130
alias: clusterv1alpha4
131-
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
131+
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
132132
alias: clusterv1beta1
133-
- pkg: sigs.k8s.io/cluster-api/api/v1beta2
133+
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
134134
alias: clusterv1
135-
# CAPI exp
136-
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/exp/v1alpha3
137-
alias: expv1alpha3
138-
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/exp/v1alpha4
139-
alias: expv1alpha4
140-
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
141-
alias: expv1beta1
142-
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta2
143-
alias: expv1
144135
# CAPI exp addons
145136
- pkg: sigs.k8s.io/cluster-api/internal/apis/addons/v1alpha3
146137
alias: addonsv1alpha3
@@ -151,16 +142,16 @@ linters:
151142
- pkg: sigs.k8s.io/cluster-api/api/addons/v1beta2
152143
alias: addonsv1
153144
# CAPI exp IPAM
154-
- pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1
145+
- pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta1
155146
alias: ipamv1beta1
156-
- pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2
147+
- pkg: sigs.k8s.io/cluster-api/api/ipam/v1beta2
157148
alias: ipamv1
158149
# CAPI exp runtime
159-
- pkg: sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1
150+
- pkg: sigs.k8s.io/cluster-api/api/runtime/v1alpha1
160151
alias: runtimev1alpha1
161-
- pkg: sigs.k8s.io/cluster-api/exp/runtime/api/v1beta2
152+
- pkg: sigs.k8s.io/cluster-api/api/runtime/v1beta2
162153
alias: runtimev1
163-
- pkg: sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1
154+
- pkg: sigs.k8s.io/cluster-api/api/runtime/hooks/v1alpha1
164155
alias: runtimehooksv1
165156
- pkg: sigs.k8s.io/cluster-api/exp/runtime/controllers
166157
alias: runtimecontrollers

‎Makefile

Lines changed: 45 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ TRACE ?= 0
5959
#
6060
# Full directory of where the Makefile resides
6161
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
62-
EXP_DIR := exp
6362
BIN_DIR := bin
6463
TEST_DIR := test
6564
TOOLS_DIR := hack/tools
@@ -282,18 +281,18 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
282281
$(MAKE) clean-generated-yaml SRC_DIRS="./config/crd/bases,./config/webhook/manifests.yaml"
283282
$(CONTROLLER_GEN) \
284283
paths=./ \
285-
paths=./api/... \
284+
paths=./api/addons/... \
285+
paths=./api/core/... \
286+
paths=./api/ipam/... \
287+
paths=./api/runtime/... \
286288
paths=./internal/apis/core/... \
287289
paths=./internal/controllers/... \
288290
paths=./internal/webhooks/... \
289291
paths=./internal/apis/addons/... \
290-
paths=./$(EXP_DIR)/api/... \
291-
paths=./$(EXP_DIR)/internal/controllers/... \
292-
paths=./$(EXP_DIR)/internal/webhooks/... \
293-
paths=./$(EXP_DIR)/ipam/api/... \
294-
paths=./$(EXP_DIR)/ipam/internal/webhooks/... \
295-
paths=./$(EXP_DIR)/runtime/api/... \
296-
paths=./$(EXP_DIR)/runtime/internal/controllers/... \
292+
paths=./exp/internal/controllers/... \
293+
paths=./exp/internal/webhooks/... \
294+
paths=./exp/ipam/internal/webhooks/... \
295+
paths=./exp/runtime/internal/controllers/... \
297296
crd:crdVersions=v1 \
298297
rbac:roleName=manager-role \
299298
output:crd:dir=./config/crd/bases \
@@ -333,8 +332,8 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
333332
generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm bootstrap
334333
$(MAKE) clean-generated-yaml SRC_DIRS="./bootstrap/kubeadm/config/crd/bases,./bootstrap/kubeadm/config/webhook/manifests.yaml"
335334
$(CONTROLLER_GEN) \
335+
paths=./api/bootstrap/kubeadm/... \
336336
paths=./bootstrap/kubeadm \
337-
paths=./bootstrap/kubeadm/api/... \
338337
paths=./bootstrap/kubeadm/internal/controllers/... \
339338
paths=./bootstrap/kubeadm/internal/webhooks/... \
340339
paths=./internal/apis/bootstrap/kubeadm/... \
@@ -349,8 +348,8 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
349348
generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm control plane
350349
$(MAKE) clean-generated-yaml SRC_DIRS="./controlplane/kubeadm/config/crd/bases,./controlplane/kubeadm/config/webhook/manifests.yaml"
351350
$(CONTROLLER_GEN) \
351+
paths=./api/controlplane/kubeadm/... \
352352
paths=./controlplane/kubeadm \
353-
paths=./controlplane/kubeadm/api/... \
354353
paths=./controlplane/kubeadm/internal/controllers/... \
355354
paths=./controlplane/kubeadm/internal/webhooks/... \
356355
paths=./internal/apis/controlplane/kubeadm/... \
@@ -367,9 +366,9 @@ generate-manifests-docker-infrastructure: $(CONTROLLER_GEN) ## Generate manifest
367366
cd $(CAPD_DIR); $(CONTROLLER_GEN) \
368367
paths=./ \
369368
paths=./api/... \
370-
paths=./$(EXP_DIR)/api/... \
371-
paths=./$(EXP_DIR)/internal/controllers/... \
372-
paths=./$(EXP_DIR)/internal/webhooks/... \
369+
paths=./exp/api/... \
370+
paths=./exp/internal/controllers/... \
371+
paths=./exp/internal/webhooks/... \
373372
paths=./internal/controllers/... \
374373
paths=./internal/webhooks/... \
375374
crd:crdVersions=v1 \
@@ -391,16 +390,16 @@ generate-go-deepcopy: ## Run all generate-go-deepcopy-* targets
391390

392391
.PHONY: generate-go-deepcopy-core
393392
generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
394-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
393+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/apis/addons,./internal/apis/core,./api/runtime/hooks"
395394
$(CONTROLLER_GEN) \
396395
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
397-
paths=./api/... \
396+
paths=./api/addons/... \
397+
paths=./api/core/... \
398+
paths=./api/ipam/... \
399+
paths=./api/runtime/... \
400+
paths=./api/runtime/hooks/... \
398401
paths=./internal/apis/addons/... \
399402
paths=./internal/apis/core/... \
400-
paths=./$(EXP_DIR)/api/... \
401-
paths=./$(EXP_DIR)/ipam/api/... \
402-
paths=./$(EXP_DIR)/runtime/api/... \
403-
paths=./$(EXP_DIR)/runtime/hooks/api/... \
404403
paths=./internal/runtime/test/... \
405404
paths=./cmd/clusterctl/... \
406405
paths=./util/test/builder/... \
@@ -409,26 +408,28 @@ generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for co
409408

410409
.PHONY: generate-go-deepcopy-kubeadm-bootstrap
411410
generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm bootstrap
412-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./bootstrap/kubeadm/api,./bootstrap/kubeadm/types"
411+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/bootstrap/kubeadm,./bootstrap/kubeadm/types"
413412
$(CONTROLLER_GEN) \
414413
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
415-
paths=./bootstrap/kubeadm/api/... \
416-
paths=./bootstrap/kubeadm/types/...
414+
paths=./api/bootstrap/kubeadm/... \
415+
paths=./bootstrap/kubeadm/types/... \
416+
paths=./internal/apis/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
420-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./controlplane/kubeadm/api"
420+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/controlplane/kubeadm"
421421
$(CONTROLLER_GEN) \
422422
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
423-
paths=./controlplane/kubeadm/api/...
423+
paths=./api/controlplane/kubeadm/... \
424+
paths=./internal/apis/controlplane/kubeadm/...
424425

425426
.PHONY: generate-go-deepcopy-docker-infrastructure
426427
generate-go-deepcopy-docker-infrastructure: $(CONTROLLER_GEN) generate-go-deepcopy-in-memory-infrastructure ## Generate deepcopy go code for docker infrastructure provider
427-
$(MAKE) clean-generated-deepcopy SRC_DIRS="$(CAPD_DIR)/api,$(CAPD_DIR)/$(EXP_DIR)/api"
428+
$(MAKE) clean-generated-deepcopy SRC_DIRS="$(CAPD_DIR)/api,$(CAPD_DIR)/exp/api"
428429
cd $(CAPD_DIR); $(CONTROLLER_GEN) \
429430
object:headerFile=../../../hack/boilerplate/boilerplate.generatego.txt \
430431
paths=./api/... \
431-
paths=./$(EXP_DIR)/api/...
432+
paths=./exp/api/...
432433

433434
.PHONY: generate-go-deepcopy-in-memory-infrastructure
434435
generate-go-deepcopy-in-memory-infrastructure: $(CONTROLLER_GEN) ## Generate deepcopy go code for in-memory cloud resources
@@ -448,19 +449,18 @@ generate-go-conversions: ## Run all generate-go-conversions-* targets
448449
generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
449450
$(MAKE) generate-go-conversions-core-api
450451
$(MAKE) generate-go-conversions-addons-api
451-
$(MAKE) generate-go-conversions-core-exp
452-
$(MAKE) generate-go-conversions-core-exp-ipam
452+
$(MAKE) generate-go-conversions-core-ipam
453453
$(MAKE) generate-go-conversions-core-runtime
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/v1beta1,./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
457+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
458458
$(CONVERSION_GEN) \
459459
--output-file=zz_generated.conversion.go \
460460
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
461461
./internal/apis/core/v1alpha3 \
462462
./internal/apis/core/v1alpha4 \
463-
./api/v1beta1
463+
./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
@@ -472,24 +472,14 @@ generate-go-conversions-addons-api: $(CONVERSION_GEN) ## Generate conversions go
472472
./internal/apis/addons/v1alpha4 \
473473
./api/addons/v1beta1
474474

475-
.PHONY: generate-go-conversions-core-exp
476-
generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go code for core exp
477-
$(MAKE) clean-generated-conversions SRC_DIRS="./exp/api/v1beta1,./internal/apis/core/exp/v1alpha3,./internal/apis/core/exp/v1alpha4"
478-
$(CONVERSION_GEN) \
479-
--output-file=zz_generated.conversion.go \
480-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
481-
./internal/apis/core/exp/v1alpha3 \
482-
./internal/apis/core/exp/v1alpha4 \
483-
./$(EXP_DIR)/api/v1beta1
484-
485-
.PHONY: generate-go-conversions-core-exp-ipam
486-
generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
487-
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1beta1,./$(EXP_DIR)/ipam/api/v1alpha1"
475+
.PHONY: generate-go-conversions-core-ipam
476+
generate-go-conversions-core-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
477+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/ipam/v1beta1,./api/ipam/v1alpha1"
488478
$(CONVERSION_GEN) \
489479
--output-file=zz_generated.conversion.go \
490480
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
491-
./$(EXP_DIR)/ipam/api/v1alpha1 \
492-
./$(EXP_DIR)/ipam/api/v1beta1
481+
./api/ipam/v1alpha1 \
482+
./api/ipam/v1beta1
493483

494484
.PHONY: generate-go-conversions-core-runtime
495485
generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions go code for core runtime
@@ -499,22 +489,21 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
499489
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
500490
./internal/runtime/test/v1alpha1 \
501491
./internal/runtime/test/v1alpha2
502-
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/runtime/api/v1alpha1,./$(EXP_DIR)/runtime/api/v1beta2"
492+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/runtime/v1alpha1"
503493
$(CONVERSION_GEN) \
504494
--output-file=zz_generated.conversion.go \
505495
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
506-
./$(EXP_DIR)/runtime/api/v1alpha1 \
507-
./$(EXP_DIR)/runtime/api/v1beta2
496+
./api/runtime/v1alpha1
508497

509498
.PHONY: generate-go-conversions-kubeadm-bootstrap
510499
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
511-
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api/v1beta1,./internal/apis/bootstrap/kubeadm"
500+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1,./internal/apis/bootstrap/kubeadm"
512501
$(CONVERSION_GEN) \
513502
--output-file=zz_generated.conversion.go \
514503
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
515504
./internal/apis/bootstrap/kubeadm/v1alpha3 \
516505
./internal/apis/bootstrap/kubeadm/v1alpha4 \
517-
./bootstrap/kubeadm/api/v1beta1
506+
./api/bootstrap/kubeadm/v1beta1
518507
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta1,./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
519508
$(CONVERSION_GEN) \
520509
--output-file=zz_generated.conversion.go \
@@ -526,13 +515,13 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
526515

527516
.PHONY: generate-go-conversions-kubeadm-control-plane
528517
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
529-
$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api/v1beta1,./internal/apis/controlplane/kubeadm"
518+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1,./internal/apis/controlplane/kubeadm"
530519
$(CONVERSION_GEN) \
531520
--output-file=zz_generated.conversion.go \
532521
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
533522
./internal/apis/controlplane/kubeadm/v1alpha3 \
534523
./internal/apis/controlplane/kubeadm/v1alpha4 \
535-
./controlplane/kubeadm/api/v1beta1
524+
./api/controlplane/kubeadm/v1beta1
536525

537526
.PHONY: generate-go-conversions-docker-infrastructure
538527
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider
@@ -541,8 +530,8 @@ generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate con
541530
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \
542531
./api/v1alpha3 \
543532
./api/v1alpha4 \
544-
./$(EXP_DIR)/api/v1alpha3 \
545-
./$(EXP_DIR)/api/v1alpha4
533+
./exp/api/v1alpha3 \
534+
./exp/api/v1alpha4
546535

547536
.PHONY: generate-go-conversions-test-extension
548537
generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversions go code for test runtime extension provider
@@ -551,7 +540,7 @@ generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversion
551540
.PHONY: generate-go-openapi
552541
generate-go-openapi: $(OPENAPI_GEN) ## Generate openapi go code for runtime SDK
553542
@mkdir -p ./tmp/sigs.k8s.io; ln -s $(ROOT_DIR) ./tmp/sigs.k8s.io/; cd ./tmp; \
554-
for pkg in "api/v1beta2" "api/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
543+
for pkg in "api/core/v1beta2" "api/core/v1beta1" "api/runtime/hooks/v1alpha1"; do \
555544
(cd ../ && $(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"); \
556545
echo "** Generating openapi schema for types in ./$${pkg} **"; \
557546
$(OPENAPI_GEN) \

0 commit comments

Comments
 (0)