Merge pull request #3433 from willie-yao/remove-old-api

Remove v1alpha3 & v1alpha4

.golangci.yml

@@ -2,11 +2,6 @@ run:
   deadline: 10m
   skip-files:
   - 'zz_generated\.(\w*)\.go$'
-  skip-dirs:
-  - 'api/v1alpha3'
-  - 'api/v1alpha4'
-  - 'exp/api/v1alpha3'
-  - 'exp/api/v1alpha4'
   build-tags:
     - e2e
 linters:
@@ -79,31 +74,15 @@ linters-settings:
       - pkg: sigs.k8s.io/controller-runtime
         alias: ctrl
       # CAPI
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
-        alias: clusterv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
-        alias: clusterv1alpha4
       - pkg: sigs.k8s.io/cluster-api/api/v1beta1
         alias: clusterv1
       # CAPI exp
-      - pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha3
-        alias: expv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha4
-        alias: expv1alpha4
       - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
         alias: expv1
       # CAPZ
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3
-        alias: infrav1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1alpha4
-        alias: infrav1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-azure/api/v1beta1
         alias: infrav1
       # CAPZ exp
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3
-        alias: infrav1alpha3exp
-      - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha4
-        alias: infrav1alpha4exp
       - pkg: sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1
         alias: infrav1exp
       - pkg: sigs.k8s.io/cluster-api-provider-azure/util/webhook
@@ -147,8 +126,6 @@ issues:
       text: "use underscores in Go names|receiver name (.+) should be consistent|methods on the same type should have the same receiver name"
     - path: 'mock(\w+)/doc.go$'
       text: "use underscores in package names|don't use an underscore in package name"
-    - path: api/v1alpha3/azureclusteridentity_types.go
-      text: "methods on the same type should have the same receiver name"
     - path: ^test/
       linters:
         - dogsled

Makefile

@@ -439,26 +439,6 @@ generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) ## Runs Go related g
 		paths=./api/... \
 		paths=./$(EXP_DIR)/api/... \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
-	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha3 \
-		--build-tag=ignore_autogenerated_core_v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
-	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha4 \
-		--build-tag=ignore_autogenerated_core_v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
-	$(CONVERSION_GEN) \
-		--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
-	$(CONVERSION_GEN) \
-		--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
 	go generate ./...
 
 .PHONY: generate-manifests
@@ -482,7 +462,7 @@ generate-flavors: $(KUSTOMIZE) generate-addons
 	./hack/gen-flavors.sh
 
 .PHONY: generate-e2e-templates
-generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates for the v1alpha4 CAPI test suite.
+generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates for the v1beta1 CAPI test suite.
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation.yaml

PROJECT

@@ -2,23 +2,6 @@ version: "3"
 domain: x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-azure
 resources:
-- group: infrastructure
-  version: v1alpha3
-  kind: AzureMachine
-- group: infrastructure
-  version: v1alpha3
-  kind: AzureCluster
-- group: infrastructure
-  version: v1alpha3
-  kind: AzureMachineTemplate
-- group: infrastructure
-  version: v1alpha4
-  kind: AzureMachine
-- group: infrastructure
-  version: v1alpha4
-  kind: AzureCluster
-- group: infrastructure
-  version: v1alpha4
   kind: AzureMachineTemplate
 - group: infrastructure
   version: v1beta1

README.md

@@ -34,13 +34,7 @@ If you need help with CAPZ, please visit the [#cluster-api-azure][slack] channel
 
 ### Cluster API Versions
 
-This provider's versions are compatible with the following versions of Cluster API:
-
-| | Cluster API `v1alpha3` (`v0.3.x`) | Cluster API `v1alpha4` (`v0.4.x`) | Cluster API `v1beta1` (`v1.0.x`) |
-|---|---|---|---|
-|Azure Provider `v0.4.x` | ✓ |  |  |
-|Azure Provider `v0.5.x` |  | ✓ |  |
-|Azure Provider `v1.0.x` |  |  | ✓ |
+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.
 
 ### Kubernetes Versions