Remove v1alpha4 API and associated code

Remove all supporting test code for v1alpha4
nutanix-cloud-native · Jul 9, 2024 · 1b6fee9 · 1b6fee9
1 parent 7a88f97
commit 1b6fee9
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 3,255 deletions.
diff --git a/Makefile b/Makefile
@@ -136,7 +136,6 @@ release-manifests: manifests cluster-templates
 generate: ## Generate code containing DeepCopy, DeepCopyInto, DeepCopyObject method implementations and API conversion implementations.
 	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
 	conversion-gen \
-	--input-dirs=./api/v1alpha4 \
 	--input-dirs=./api/v1beta1 \
 	--build-tag=ignore_autogenerated_core \
 	--output-file-base=zz_generated.conversion \
@@ -213,14 +212,11 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 ##@ Templates
 
 .PHONY: cluster-e2e-templates
-cluster-e2e-templates: cluster-e2e-templates-v1beta1 cluster-e2e-templates-v1alpha4 cluster-e2e-templates-v135 ## Generate cluster templates for all versions
+cluster-e2e-templates: cluster-e2e-templates-v1beta1 cluster-e2e-templates-v135 ## Generate cluster templates for all versions
 
 cluster-e2e-templates-v135: ## Generate cluster templates for CAPX v1.3.0
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1.3.5/cluster-template --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1.3.5/cluster-template.yaml
 
-cluster-e2e-templates-v1alpha4:  ## Generate cluster templates for v1alpha4
-	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1alpha4/cluster-template --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1alpha4/cluster-template.yaml
-
 cluster-e2e-templates-v1beta1: ## Generate cluster templates for v1beta1
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template.yaml
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template-no-secret --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template-no-secret.yaml
@@ -239,9 +235,6 @@ cluster-e2e-templates-v1beta1: ## Generate cluster templates for v1beta1
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template-topology.yaml
 
 cluster-e2e-templates-no-kubeproxy: ##Generate cluster templates without kubeproxy
-	# v1alpha4
-	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1alpha4/no-kubeproxy/cluster-template --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1alpha4/cluster-template.yaml
-
 	# v1beta1
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1beta1/no-kubeproxy/cluster-template --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template.yaml
 	kustomize build $(NUTANIX_E2E_TEMPLATES)/v1beta1/no-kubeproxy/cluster-template-no-secret --load-restrictor LoadRestrictionsNone > $(NUTANIX_E2E_TEMPLATES)/v1beta1/cluster-template-no-secret.yaml
@@ -293,7 +286,7 @@ mocks: ## Generate mocks for the project
 	mockgen -destination=mocks/k8sclient/lister.go -package=mockk8sclient k8s.io/client-go/listers/core/v1 SecretLister,SecretNamespaceLister
 	mockgen -destination=mocks/k8sapimachinery/interfaces.go -package=mockmeta k8s.io/apimachinery/pkg/api/meta RESTMapper,RESTScope
 
-GOTESTPKGS = $(shell go list ./... | grep -v /mocks | grep -v /templates | grep -v /v1alpha4)
+GOTESTPKGS = $(shell go list ./... | grep -v /mocks | grep -v /templates)
 
 .PHONY: unit-test
 unit-test: mocks  ## Run unit tests.

diff --git a/PROJECT b/PROJECT
@@ -15,25 +15,25 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: NutanixCluster
-  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4
-  version: v1alpha4
+  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1
+  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: NutanixMachine
-  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4
-  version: v1alpha4
+  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1
+  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: NutanixMachineTemplate
-  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1alpha4
-  version: v1alpha4
+  path: github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1
+  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true

diff --git a/api/v1alpha4/conditions.go b/api/v1alpha4/conditions.go
diff --git a/api/v1alpha4/doc.go b/api/v1alpha4/doc.go
diff --git a/api/v1alpha4/groupversion_info.go b/api/v1alpha4/groupversion_info.go
diff --git a/api/v1alpha4/nutanix_types.go b/api/v1alpha4/nutanix_types.go
diff --git a/api/v1alpha4/nutanixcluster_conversion.go b/api/v1alpha4/nutanixcluster_conversion.go