Merge pull request #674 from cprivitere/capi-1.5

 ✨ CAPI 1.5 support

.gitignore

@@ -45,7 +45,6 @@ dist
 .tiltbuild/
 
 # E2E test templates
-test/e2e/data/v1alpha3/cluster-template*.yaml
 test/e2e/data/v1beta1/cluster-template*.yaml
 
 #VS Code

.golangci.yml

@@ -205,13 +205,6 @@ issues:
   # changes in PRs and avoid nitpicking.
   exclude-use-default: false
   exclude-rules:
-    - path: api/v1alpha3
-      linters:
-        - revive
-        - gosec
-        - stylecheck
-    # Specific exclude rules for deprecated fields that are still part of the codebase. These
-    # should be removed as the referenced deprecated item is removed from the project.
     - linters:
         - staticcheck
       text: "SA1019: (noderefutil.*|parsed.*) is deprecated"

Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the manager binary
-ARG GOVER=1.20.10
+ARG GOVER=1.20.11
 FROM golang:${GOVER} as builder
 
 WORKDIR /workspace

Makefile

@@ -69,12 +69,12 @@ endif
 ## Binaries.
 
 # Sync to controller-tools version in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/hack/tools/go.mod
-CONTROLLER_GEN_VER := v0.11.4
+CONTROLLER_GEN_VER := v0.12.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-# Sync to k8s.io/* verisons in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
-CONVERSION_GEN_VER := v0.26.1
+# Sync to k8s.io/* versions in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
+CONVERSION_GEN_VER := v0.27.8
 CONVERSION_GEN_BIN := conversion-gen
 CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
 
@@ -84,7 +84,7 @@ ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
 
 # Bump as necessary/desired to latest that supports our version of go at https://github.com/golangci/golangci-lint/releases
-GOLANGCI_LINT_VER := v1.51.1
+GOLANGCI_LINT_VER := v1.53.3
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
@@ -95,15 +95,15 @@ KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
 
 # Sync to github.com/onsi/ginkgo verison in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
-GINKGO_VER := v2.9.2
+GINKGO_VER := v2.11.0
 GINKGO_BIN := ginkgo
 GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
 GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
 
 TIMEOUT := $(shell command -v timeout || command -v gtimeout)
 
 # Define Docker related variables. Releases should modify and double check these vars.
-REGISTRY ?= ghcr.io/kubernetes-sigs
+REGISTRY ?= quay.io/equinix-oss
 export IMAGE_NAME ?= cluster-api-provider-packet
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
 export TAG ?= dev
@@ -219,12 +219,7 @@ test-e2e-ci:
 TEST_TEMPLATES_TARGET_DIR ?= $(REPO_ROOT)/test/e2e/data
 
 .PHONY: e2e-test-templates
-e2e-test-templates: $(KUSTOMIZE) e2e-test-templates-v1alpha3 e2e-test-templates-v1beta1 ## Generate cluster templates for all versions
-
-e2e-test-templates-v1alpha3: $(KUSTOMIZE) ## Generate cluster templates for v1alpha3
-	mkdir -p $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/
-	$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-packet-ccm --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-packet-ccm.yaml
-	$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-cpem --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-cpem.yaml
+e2e-test-templates: $(KUSTOMIZE) e2e-test-templates-v1beta1 ## Generate cluster templates for all versions
 
 e2e-test-templates-v1beta1: $(KUSTOMIZE) ## Generate cluster templates for v1beta1
 	mkdir -p $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/
@@ -297,12 +292,6 @@ generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate tar
 	$(CONTROLLER_GEN) \
 		paths=./api/... \
 		object:headerFile=./hack/boilerplate.go.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.go.txt $(GEN_OUTPUT_BASE)
 	go generate ./...
 
 .PHONY: generate-manifests