Skip to content

Commit 114b4e6

Browse files
committed
Remove v1alpha3 & v1alpha4
1 parent 472d767 commit 114b4e6

File tree

92 files changed

+331
-23286
lines changed

Some content is hidden

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

92 files changed

+331
-23286
lines changed

.golangci.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ run:
22
deadline: 10m
33
skip-files:
44
- 'zz_generated\.(\w*)\.go$'
5-
skip-dirs:
6-
- 'api/v1alpha3'
7-
- 'api/v1alpha4'
8-
- 'exp/api/v1alpha3'
9-
- 'exp/api/v1alpha4'
105
build-tags:
116
- e2e
127
linters:
@@ -79,31 +74,15 @@ linters-settings:
7974
- pkg: sigs.k8s.io/controller-runtime
8075
alias: ctrl
8176
# CAPI
82-
- pkg: sigs.k8s.io/cluster-api/api/v1alpha3
83-
alias: clusterv1alpha3
84-
- pkg: sigs.k8s.io/cluster-api/api/v1alpha4
85-
alias: clusterv1alpha4
8677
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
8778
alias: clusterv1
8879
# CAPI exp
89-
- pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha3
90-
alias: expv1alpha3
91-
- pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha4
92-
alias: expv1alpha4
9380
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
9481
alias: expv1
9582
# CAPZ
96-
- pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3
97-
alias: infrav1alpha3
98-
- pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4
99-
alias: infrav1alpha4
10083
- pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1beta1
10184
alias: infrav1
10285
# CAPZ exp
103-
- pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3
104-
alias: infrav1alpha3exp
105-
- pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha4
106-
alias: infrav1alpha4exp
10786
- pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1
10887
alias: infrav1exp
10988
- pkg: sigs.k8s.io/cluster-api-provider-azure/util/webhook
@@ -147,8 +126,6 @@ issues:
147126
text: "use underscores in Go names|receiver name (.+) should be consistent|methods on the same type should have the same receiver name"
148127
- path: 'mock(\w+)/doc.go$'
149128
text: "use underscores in package names|don't use an underscore in package name"
150-
- path: api/v1alpha3/azureclusteridentity_types.go
151-
text: "methods on the same type should have the same receiver name"
152129
- path: ^test/
153130
linters:
154131
- dogsled

Makefile

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -439,26 +439,6 @@ generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) ## Runs Go related g
439439
paths=./api/... \
440440
paths=./$(EXP_DIR)/api/... \
441441
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
442-
$(CONVERSION_GEN) \
443-
--input-dirs=./api/v1alpha3 \
444-
--build-tag=ignore_autogenerated_core_v1alpha3 \
445-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
446-
--output-file-base=zz_generated.conversion \
447-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
448-
$(CONVERSION_GEN) \
449-
--input-dirs=./api/v1alpha4 \
450-
--build-tag=ignore_autogenerated_core_v1alpha4 \
451-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
452-
--output-file-base=zz_generated.conversion \
453-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
454-
$(CONVERSION_GEN) \
455-
--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
456-
--output-file-base=zz_generated.conversion \
457-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
458-
$(CONVERSION_GEN) \
459-
--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
460-
--output-file-base=zz_generated.conversion \
461-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
462442
go generate ./...
463443

464444
.PHONY: generate-manifests
@@ -482,7 +462,7 @@ generate-flavors: $(KUSTOMIZE) generate-addons
482462
./hack/gen-flavors.sh
483463

484464
.PHONY: generate-e2e-templates
485-
generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates for the v1alpha4 CAPI test suite.
465+
generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates for the v1beta1 CAPI test suite.
486466
$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template.yaml
487467
$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation.yaml
488468
$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation.yaml

PROJECT

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,6 @@ version: "3"
22
domain: x-k8s.io
33
repo: sigs.k8s.io/cluster-api-provider-azure
44
resources:
5-
- group: infrastructure
6-
version: v1alpha3
7-
kind: AzureMachine
8-
- group: infrastructure
9-
version: v1alpha3
10-
kind: AzureCluster
11-
- group: infrastructure
12-
version: v1alpha3
13-
kind: AzureMachineTemplate
14-
- group: infrastructure
15-
version: v1alpha4
16-
kind: AzureMachine
17-
- group: infrastructure
18-
version: v1alpha4
19-
kind: AzureCluster
20-
- group: infrastructure
21-
version: v1alpha4
225
kind: AzureMachineTemplate
236
- group: infrastructure
247
version: v1beta1

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@ If you need help with CAPZ, please visit the [#cluster-api-azure][slack] channel
3434

3535
### Cluster API Versions
3636

37-
This provider's versions are compatible with the following versions of Cluster API:
38-
39-
| | Cluster API `v1alpha3` (`v0.3.x`) | Cluster API `v1alpha4` (`v0.4.x`) | Cluster API `v1beta1` (`v1.0.x`) |
40-
|---|---|---|---|
41-
|Azure Provider `v0.4.x` || | |
42-
|Azure Provider `v0.5.x` | || |
43-
|Azure Provider `v1.0.x` | | ||
37+
Currently, CAPZ is compatible only with the `v1beta1` version of CAPI (v1.0.x). Support for `v1alpha3` (v0.3.x) and `v1alpha4` (v0.4.x) is deprecated and has been removed.
4438

4539
### Kubernetes Versions
4640

0 commit comments

Comments
 (0)