Skip to content

Commit 0364cf9

Browse files
sbueringersbueringer
committed
Remove v1alpha3 + v1alpha4 apiVersions
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent d437fb3 commit 0364cf9

File tree

178 files changed

+14
-53652
lines changed

Some content is hidden

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

178 files changed

+14
-53652
lines changed

‎.golangci-kal.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ linters:
7575
paths:
7676
- zz_generated.*\.go$
7777
- vendored_openapi\.go$
78-
# We don't want to invest time to fix new linter findings in old API types.
79-
- internal/api/.*
8078
- ".*_test.go" # Exclude test files.
8179
rules:
8280
## KAL should only run on API folders.

‎.golangci.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -115,37 +115,21 @@ linters:
115115
- pkg: sigs.k8s.io/controller-runtime
116116
alias: ctrl
117117
# CABPK
118-
- pkg: sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha3
119-
alias: bootstrapv1alpha3
120-
- pkg: sigs.k8s.io/cluster-api/internal/api/bootstrap/kubeadm/v1alpha4
121-
alias: bootstrapv1alpha4
122118
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1
123119
alias: bootstrapv1beta1
124120
- pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
125121
alias: bootstrapv1
126122
# KCP
127-
- pkg: sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha3
128-
alias: controlplanev1alpha3
129-
- pkg: sigs.k8s.io/cluster-api/internal/api/controlplane/kubeadm/v1alpha4
130-
alias: controlplanev1alpha4
131123
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1
132124
alias: controlplanev1beta1
133125
- pkg: sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2
134126
alias: controlplanev1
135127
# CAPI
136-
- pkg: sigs.k8s.io/cluster-api/internal/api/core/v1alpha3
137-
alias: clusterv1alpha3
138-
- pkg: sigs.k8s.io/cluster-api/internal/api/core/v1alpha4
139-
alias: clusterv1alpha4
140128
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
141129
alias: clusterv1beta1
142130
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
143131
alias: clusterv1
144132
# CAPI exp addons
145-
- pkg: sigs.k8s.io/cluster-api/internal/api/addons/v1alpha3
146-
alias: addonsv1alpha3
147-
- pkg: sigs.k8s.io/cluster-api/internal/api/addons/v1alpha4
148-
alias: addonsv1alpha4
149133
- pkg: sigs.k8s.io/cluster-api/api/addons/v1beta1
150134
alias: addonsv1beta1
151135
- pkg: sigs.k8s.io/cluster-api/api/addons/v1beta2
@@ -188,19 +172,11 @@ linters:
188172
- pkg: sigs.k8s.io/cluster-api/internal/util/controller
189173
alias: "capicontrollerutil"
190174
# CAPD
191-
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3
192-
alias: infrav1alpha3
193-
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4
194-
alias: infrav1alpha4
195175
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1
196176
alias: infrav1beta1
197177
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2
198178
alias: infrav1
199179
# CAPD exp
200-
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha3
201-
alias: infraexpv1alpha3
202-
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha4
203-
alias: infraexpv1alpha4
204180
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
205181
alias: infraexpv1beta1
206182
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2
@@ -246,7 +222,6 @@ linters:
246222
paths:
247223
- zz_generated.*\.go$
248224
- vendored_openapi\.go$
249-
- internal/api/.*
250225
rules:
251226
# Specific exclude rules for deprecated fields that are still part of the codebase. These
252227
# should be removed as the referenced deprecated item is removed from the project.
@@ -267,9 +242,6 @@ linters:
267242
text: 'SA1019: .* is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.'
268243
# Specific exclude rules for deprecated types that are still part of the codebase. These
269244
# should be removed as the referenced deprecated types are removed from the project.
270-
- linters:
271-
- staticcheck
272-
text: 'SA1019: (clusterv1alpha3.*|clusterv1alpha4.*) is deprecated: This type will be removed in one of the next releases.'
273245
# v1Beta1 deprecated fields
274246
- linters:
275247
- staticcheck
@@ -448,4 +420,3 @@ formatters:
448420
- zz_generated.*\.go$
449421
- vendored_openapi\.go$
450422
# We don't want to invest time to fix new linter findings in old API types.
451-
- internal/api/.*

‎Makefile‎

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,8 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
290290
paths=./api/core/... \
291291
paths=./api/ipam/... \
292292
paths=./api/runtime/... \
293-
paths=./internal/api/core/... \
294293
paths=./internal/controllers/... \
295294
paths=./internal/webhooks/... \
296-
paths=./internal/api/addons/... \
297295
crd:crdVersions=v1 \
298296
rbac:roleName=manager-role \
299297
output:crd:dir=./config/crd/bases \
@@ -345,7 +343,6 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
345343
paths=./bootstrap/kubeadm \
346344
paths=./bootstrap/kubeadm/internal/controllers/... \
347345
paths=./bootstrap/kubeadm/internal/webhooks/... \
348-
paths=./internal/api/bootstrap/kubeadm/... \
349346
crd:crdVersions=v1 \
350347
rbac:roleName=manager-role \
351348
output:crd:dir=./bootstrap/kubeadm/config/crd/bases \
@@ -361,7 +358,6 @@ generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifest
361358
paths=./controlplane/kubeadm \
362359
paths=./controlplane/kubeadm/internal/controllers/... \
363360
paths=./controlplane/kubeadm/internal/webhooks/... \
364-
paths=./internal/api/controlplane/kubeadm/... \
365361
crd:crdVersions=v1 \
366362
rbac:roleName=manager-role \
367363
output:crd:dir=./controlplane/kubeadm/config/crd/bases \
@@ -396,7 +392,7 @@ generate-go-deepcopy: ## Run all generate-go-deepcopy-* targets
396392

397393
.PHONY: generate-go-deepcopy-core
398394
generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
399-
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./internal/api/addons,./internal/api/core,./api/runtime/hooks"
395+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/addons,./api/core,./api/ipam,./api/runtime,./api/runtime/hooks"
400396
$(CONTROLLER_GEN) \
401397
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
402398
paths=./api/addons/... \
@@ -406,8 +402,6 @@ generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for co
406402
paths=./api/runtime/hooks/... \
407403
paths=./cmd/clusterctl/... \
408404
paths=./controllers/crdmigrator/test/... \
409-
paths=./internal/api/addons/... \
410-
paths=./internal/api/core/... \
411405
paths=./internal/runtime/test/... \
412406
paths=./internal/topology/upgrade/test/... \
413407
paths=./util/test/builder/... \
@@ -419,16 +413,14 @@ generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy g
419413
$(CONTROLLER_GEN) \
420414
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
421415
paths=./api/bootstrap/kubeadm/... \
422-
paths=./bootstrap/kubeadm/types/... \
423-
paths=./internal/api/bootstrap/kubeadm/...
416+
paths=./bootstrap/kubeadm/types/...
424417

425418
.PHONY: generate-go-deepcopy-kubeadm-control-plane
426419
generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm control plane
427420
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api/controlplane/kubeadm"
428421
$(CONTROLLER_GEN) \
429422
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
430-
paths=./api/controlplane/kubeadm/... \
431-
paths=./internal/api/controlplane/kubeadm/...
423+
paths=./api/controlplane/kubeadm/...
432424

433425
.PHONY: generate-go-deepcopy-docker-infrastructure
434426
generate-go-deepcopy-docker-infrastructure: $(CONTROLLER_GEN) generate-go-deepcopy-in-memory-infrastructure ## Generate deepcopy go code for docker infrastructure provider
@@ -460,23 +452,19 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
460452

461453
.PHONY: generate-go-conversions-core-api
462454
generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
463-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/api/core/v1alpha3,./internal/api/core/v1alpha4,./internal/topology/upgrade/test/t2/v1beta1"
455+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/core/v1beta1,./internal/topology/upgrade/test/t2/v1beta1"
464456
$(CONVERSION_GEN) \
465457
--output-file=zz_generated.conversion.go \
466458
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
467-
./internal/api/core/v1alpha3 \
468-
./internal/api/core/v1alpha4 \
469459
./api/core/v1beta1 \
470460
./internal/topology/upgrade/test/t2/v1beta1
471461

472462
.PHONY: generate-go-conversions-addons-api
473463
generate-go-conversions-addons-api: $(CONVERSION_GEN) ## Generate conversions go code for addons api
474-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/addons/v1beta1,./internal/api/addons/v1alpha3,./internal/api/addons/v1alpha4"
464+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/addons/v1beta1"
475465
$(CONVERSION_GEN) \
476466
--output-file=zz_generated.conversion.go \
477467
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
478-
./internal/api/addons/v1alpha3 \
479-
./internal/api/addons/v1alpha4 \
480468
./api/addons/v1beta1
481469

482470
.PHONY: generate-go-conversions-core-ipam
@@ -504,12 +492,10 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
504492

505493
.PHONY: generate-go-conversions-kubeadm-bootstrap
506494
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
507-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1,./internal/api/bootstrap/kubeadm"
495+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/bootstrap/kubeadm/v1beta1"
508496
$(CONVERSION_GEN) \
509497
--output-file=zz_generated.conversion.go \
510498
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
511-
./internal/api/bootstrap/kubeadm/v1alpha3 \
512-
./internal/api/bootstrap/kubeadm/v1alpha4 \
513499
./api/bootstrap/kubeadm/v1beta1
514500
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
515501
$(CONVERSION_GEN) \
@@ -520,21 +506,17 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
520506

521507
.PHONY: generate-go-conversions-kubeadm-control-plane
522508
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
523-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1,./internal/api/controlplane/kubeadm"
509+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/controlplane/kubeadm/v1beta1"
524510
$(CONVERSION_GEN) \
525511
--output-file=zz_generated.conversion.go \
526512
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
527-
./internal/api/controlplane/kubeadm/v1alpha3 \
528-
./internal/api/controlplane/kubeadm/v1alpha4 \
529513
./api/controlplane/kubeadm/v1beta1
530514

531515
.PHONY: generate-go-conversions-docker-infrastructure
532516
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider
533517
cd $(CAPD_DIR); $(CONVERSION_GEN) \
534518
--output-file=zz_generated.conversion.go \
535519
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \
536-
./api/v1alpha3 \
537-
./api/v1alpha4 \
538520
./api/v1beta1
539521

540522
.PHONY: generate-go-conversions-test-extension
@@ -567,28 +549,10 @@ generate-doctoc:
567549
TRACE=$(TRACE) ./hack/generate-doctoc.sh
568550

569551
.PHONY: generate-e2e-templates
570-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.5 v1.6 v1.10 v1.11 v1.12 main) ## Generate cluster templates for all versions
552+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.10 v1.11 v1.12 main) ## Generate cluster templates for all versions
571553

572554
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
573555

574-
.PHONY: generate-e2e-templates-v0.3
575-
generate-e2e-templates-v0.3: $(KUSTOMIZE)
576-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.3/cluster-template.yaml
577-
578-
.PHONY: generate-e2e-templates-v0.4
579-
generate-e2e-templates-v0.4: $(KUSTOMIZE)
580-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.4/cluster-template.yaml
581-
582-
.PHONY: generate-e2e-templates-v1.5
583-
generate-e2e-templates-v1.5: $(KUSTOMIZE)
584-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.5/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.5/cluster-template.yaml
585-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.5/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.5/cluster-template-topology.yaml
586-
587-
.PHONY: generate-e2e-templates-v1.6
588-
generate-e2e-templates-v1.6: $(KUSTOMIZE)
589-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.6/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.6/cluster-template.yaml
590-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.6/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.6/cluster-template-topology.yaml
591-
592556
.PHONY: generate-e2e-templates-v1.10
593557
generate-e2e-templates-v1.10: $(KUSTOMIZE)
594558
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.10/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.10/cluster-template.yaml
@@ -727,8 +691,7 @@ verify-gen: generate ## Verify go generated files are up to date
727691
verify-conversions: $(CONVERSION_VERIFIER) ## Verifies expected API conversion are in place
728692
$(CONVERSION_VERIFIER) \
729693
./api/... \
730-
./internal/api/... \
731-
./test/infrastructure/docker/api/... \
694+
./test/infrastructure/docker/api/...
732695

733696
.PHONY: verify-doctoc
734697
verify-doctoc: generate-doctoc

0 commit comments

Comments
 (0)