[deps] bump go to 1.25, bump deps in devbox.lock, move go dev deps into go tools (#892)

* bump go to 1.25

* update go tools to see if it's fixed in the latest version for go 1.25

* update devbox.lock

* attempt to switch to using go tools instead of diverging dep versions in the Makefile which are less straightforward to update

* fix lint

* regenerate with new dep version

* fix GHA to use the version of golangci-lint we declare in tools rather than the action, add missing steps for gosec (added to go tools) and vulncheck in the go-analyze workflow

* fix for KAL lint

* fix covdata complaint, fix envtest

* downgrade chainsaw to v0.2.12, tidy go.mod

* chainsaw doesn't seem to work because of missings CRDs if installed as a go tool

* add tools as a dep for last-release-cluster

Author: AshleyDumaine

.github/workflows/go-analyze.yml

@@ -69,12 +69,16 @@ jobs:
           cache: false
 
       - name: lint
-        uses: golangci/golangci-lint-action@v8
-        with:
-          version: latest
+        run: make lint
 
       - name: lint-api
         run: make lint-api
 
       - name: Nilcheck
         run: make nilcheck
+
+      - name: Vulncheck
+        run: make vulncheck
+
+      - name: Gosec
+        run: make gosec

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.24 as builder
+FROM golang:1.25 as builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG VERSION

Makefile

@@ -5,7 +5,7 @@ REGISTRY            ?= docker.io/linode
 IMAGE_NAME          ?= cluster-api-provider-linode
 CONTROLLER_IMAGE    ?= $(REGISTRY)/$(IMAGE_NAME)
 TAG                 ?= dev
-ENVTEST_K8S_VERSION := $(shell go list -m -f '{{.Version}}' k8s.io/client-go)
+ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
 VERSION             ?= $(shell git describe --always --tag --dirty=-dev)
 BUILD_ARGS          := --build-arg VERSION=$(VERSION)
 SHELL                = /usr/bin/env bash -o pipefail
@@ -80,25 +80,25 @@ help: ## Display this help.
 generate: generate-manifests generate-code generate-mock generate-api-docs
 
 .PHONY: generate-manifests
-generate-manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+generate-manifests: tools ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
+	controller-gen rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate-code
-generate-code: controller-gen gowrap ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+generate-code: tools ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	go generate ./...
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: generate-mock
-generate-mock: mockgen ## Generate mocks for the Linode API client.
-	$(MOCKGEN) -source=./clients/clients.go -destination ./mock/client.go -package mock
+generate-mock: tools ## Generate mocks for the Linode API client.
+	mockgen -source=./clients/clients.go -destination ./mock/client.go -package mock
 
 .PHONY: generate-flavors ## Generate template flavors.
-generate-flavors: $(KUSTOMIZE)
+generate-flavors:
 	bash hack/generate-flavors.sh
 
 .PHONY: generate-api-docs
-generate-api-docs: crd-ref-docs ## Generate API reference documentation.
-	$(CRD_REF_DOCS) \
+generate-api-docs: tools ## Generate API reference documentation.
+	crd-ref-docs \
 		--config=./docs/.crd-ref-docs.yaml \
 		--source-path=./api/ \
 		--renderer=markdown \
@@ -123,23 +123,23 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 .PHONY: gosec
-gosec: ## Run gosec against code.
-	docker run --rm -w /workdir -v $(PWD):/workdir securego/gosec:2.19.0 -exclude-dir=bin -exclude-generated ./...
+gosec: tools ## Run gosec against code.
+	gosec -exclude-dir=bin -exclude-generated ./...
 
 .PHONY: lint
-lint: ## Run lint against code.
-	$(GOLANGCI_LINT) run -c .golangci.yml
+lint: tools ## Run lint against code.
+	golangci-lint run -c .golangci.yml
 
 .PHONY: lint
 lint-api: golangci-lint-kal ## Run lint against code.
 	$(GOLANGCI_LINT_KAL) run -c .golangci-kal.yml
 
 .PHONY: nilcheck
-nilcheck: nilaway ## Run nil check against code.
+nilcheck: tools ## Run nil check against code.
 	go list ./... | xargs -I {} -d '\n' nilaway -include-pkgs {} -exclude-file-docstrings "ignore_autogenerated" ./...
 
 .PHONY: vulncheck
-vulncheck: govulncheck ## Run vulnerability check against code.
+vulncheck: tools ## Run vulnerability check against code.
 	govulncheck ./...
 
 .PHONY: docs
@@ -153,22 +153,23 @@ docs:
 ##@ Testing:
 
 .PHONY: test
-test: generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use ${ENVTEST_K8S_VERSION#v} --bin-dir $(CACHE_BIN) -p path)" go test -race -timeout 60s `go list ./... | grep -v ./mock$$`  -coverprofile cover.out.tmp
+test: generate fmt vet ## Run tests.
+	go env -w GOTOOLCHAIN=go1.25.0+auto
+	KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(CACHE_BIN) -p path)" go test -race -timeout 60s `go list ./... | grep -v ./mock$$`  -coverprofile cover.out.tmp
 	grep -v "zz_generated.*" cover.out.tmp > cover.out
 	rm cover.out.tmp
 
 .PHONY: e2etest
-e2etest: generate local-release local-deploy chainsaw s5cmd
-	SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --parallel 2 --selector $(E2E_SELECTOR) $(E2E_FLAGS)
+e2etest: generate local-release local-deploy
+	SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) chainsaw test ./e2e --parallel 2 --selector $(E2E_SELECTOR) $(E2E_FLAGS)
 
 .PHONY: local-deploy
-local-deploy: kind-cluster tilt kustomize clusterctl
+local-deploy: tools kind-cluster
 	$(TILT) ci -f Tiltfile
 
 .PHONY: kind-cluster
-kind-cluster: kind ctlptl
-	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
+kind-cluster: tools
+	ctlptl apply -f .tilt/ctlptl-config.yaml
 
 ##@ Test Upgrade:
 
@@ -185,18 +186,18 @@ checkout-last-release:
 	git checkout $(LAST_RELEASE)
 
 .PHONY: last-release-cluster
-last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw kind-cluster checkout-last-release local-release local-deploy
-	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) SKIP_CUSTOM_DELETE=true $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s --skip-delete ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
+last-release-cluster: tools kind-cluster checkout-last-release local-release local-deploy
+	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) SKIP_CUSTOM_DELETE=true chainsaw test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s --skip-delete ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
 
 .PHONY: test-upgrade
 test-upgrade: last-release-cluster checkout-latest-commit
 	$(MAKE) local-release
 	$(MAKE) local-deploy
-	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 800s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
+	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) chainsaw test --namespace $(COMMON_NAMESPACE) --assert-timeout 800s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
 
 .PHONY: clean-kind-cluster
-clean-kind-cluster: ctlptl
-	$(CTLPTL) delete -f .tilt/ctlptl-config.yaml
+clean-kind-cluster:
+	ctlptl delete -f .tilt/ctlptl-config.yaml
 
 ## --------------------------------------
 ## Build
@@ -245,8 +246,8 @@ ifndef ignore-not-found
 endif
 
 .PHONY: tilt-cluster
-tilt-cluster: ctlptl tilt kind clusterctl
-	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
+tilt-cluster: tools
+	ctlptl apply -f .tilt/ctlptl-config.yaml
 	$(TILT) up
 
 ## --------------------------------------
@@ -258,7 +259,7 @@ tilt-cluster: ctlptl tilt kind clusterctl
 RELEASE_DIR ?= infrastructure-linode
 
 .PHONY: release
-release: kustomize clean-release set-manifest-image release-manifests generate-flavors release-templates release-metadata clean-release-git
+release: tools clean-release set-manifest-image release-manifests generate-flavors release-templates release-metadata clean-release-git
 
 $(RELEASE_DIR):
 	mkdir -p $(RELEASE_DIR)/
@@ -277,8 +278,8 @@ set-manifest-image: ## Update kustomize image patch file for default resource.
 	sed -i'' -e 's@image: .*@image: '"$(REGISTRY)/$(IMAGE_NAME):$(VERSION)"'@' ./config/default/manager_image_patch.yaml
 
 .PHONY: release-manifests
-release-manifests: $(KUSTOMIZE) $(RELEASE_DIR)
-	$(KUSTOMIZE) build config/default > $(RELEASE_DIR)/infrastructure-components.yaml
+release-manifests: tools $(RELEASE_DIR)
+	kustomize build config/default > $(RELEASE_DIR)/infrastructure-components.yaml
 
 .PHONY: local-release
 local-release:
@@ -339,73 +340,34 @@ $(CACHE_BIN):
 ## --------------------------------------
 
 ##@ Tooling Binaries:
-# setup-envtest does not have devbox support so always use CACHE_BIN
 
 KUBECTL        ?= $(LOCALBIN)/kubectl
-KUSTOMIZE      ?= $(LOCALBIN)/kustomize
-CTLPTL         ?= $(LOCALBIN)/ctlptl
 CLUSTERCTL     ?= $(LOCALBIN)/clusterctl
-CRD_REF_DOCS   ?= $(CACHE_BIN)/crd-ref-docs
 KUBEBUILDER    ?= $(LOCALBIN)/kubebuilder
-CONTROLLER_GEN ?= $(CACHE_BIN)/controller-gen
-CONVERSION_GEN ?= $(CACHE_BIN)/conversion-gen
 TILT           ?= $(LOCALBIN)/tilt
 KIND           ?= $(LOCALBIN)/kind
-CHAINSAW       ?= $(LOCALBIN)/chainsaw
-ENVTEST        ?= $(CACHE_BIN)/setup-envtest
-NILAWAY        ?= $(LOCALBIN)/nilaway
-GOVULNC        ?= $(LOCALBIN)/govulncheck
-MOCKGEN        ?= $(LOCALBIN)/mockgen
-GOWRAP         ?= $(CACHE_BIN)/gowrap
-GOLANGCI_LINT  ?= $(LOCALBIN)/golangci-lint
 GOLANGCI_LINT_KAL ?= $(CACHE_BIN)/golangci-lint-kube-api-linter
-S5CMD          ?= $(CACHE_BIN)/s5cmd
 
 ## Tool Versions
-KUSTOMIZE_VERSION        ?= v5.4.3
-CTLPTL_VERSION           ?= v0.8.29
 CLUSTERCTL_VERSION       ?= v1.11.1
-CRD_REF_DOCS_VERSION     ?= v0.1.0
 KUBECTL_VERSION          ?= v1.28.0
 KUBEBUILDER_VERSION      ?= v3.15.1
-CONTROLLER_TOOLS_VERSION ?= v0.16.5
 TILT_VERSION             ?= 0.33.10
 KIND_VERSION             ?= 0.23.0
-CHAINSAW_VERSION         ?= v0.2.11
-HUSKY_VERSION            ?= v0.2.16
-NILAWAY_VERSION          ?= d2274102dc2eab9f77cef849a5470a6ebf983125
-GOVULNC_VERSION          ?= v1.1.1
-MOCKGEN_VERSION          ?= v0.4.0
-GOWRAP_VERSION           ?= v1.4.0
-S5CMD_VERSION            ?= v2.2.2
-CONVERSION_GEN_VERSION   ?= v0.32.2
-GOLANGCI_LINT_VERSION    ?= v2.1.5
+CHAINSAW_VERSION         ?= v0.2.13
 
 .PHONY: tools
-tools: $(KUSTOMIZE) $(CTLPTL) $(CLUSTERCTL) $(KUBECTL) $(CONTROLLER_GEN) $(CONVERSION_GEN) $(TILT) $(KIND) $(CHAINSAW) $(ENVTEST) $(HUSKY) $(NILAWAY) $(GOVULNC) $(MOCKGEN) $(GOWRAP)
-
-
-.PHONY: kustomize
-kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
-$(KUSTOMIZE): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION)
-
-.PHONY: ctlptl
-ctlptl: $(CTLPTL) ## Download ctlptl locally if necessary.
-$(CTLPTL): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install github.com/tilt-dev/ctlptl/cmd/ctlptl@$(CTLPTL_VERSION)
+tools: $(CLUSTERCTL) $(KUBECTL) $(KUBEBUILDER) $(TILT) $(KIND)
+	go install tool
+##@ we can't manage this with go tools because it causes a panic due to missing CRDs when running chainsaw
+	go install github.com/kyverno/chainsaw@$(CHAINSAW_VERSION)
 
 .PHONY: clusterctl
 clusterctl: $(CLUSTERCTL) ## Download clusterctl locally if necessary.
 $(CLUSTERCTL): $(LOCALBIN)
 	curl -fsSL https://github.com/kubernetes-sigs/cluster-api/releases/download/$(CLUSTERCTL_VERSION)/clusterctl-$(OS)-$(ARCH_SHORT) -o $(CLUSTERCTL)
 	chmod +x $(CLUSTERCTL)
 
-.PHONY: crd-ref-docs
-crd-ref-docs: $(CRD_REF_DOCS) ## Download crd-ref-docs locally if necessary.
-$(CRD_REF_DOCS): $(LOCALBIN)
-	GOBIN=$(CACHE_BIN) go install github.com/elastic/crd-ref-docs@$(CRD_REF_DOCS_VERSION)
-
 .PHONY: kubectl
 kubectl: $(KUBECTL) ## Download kubectl locally if necessary.
 $(KUBECTL): $(LOCALBIN)
@@ -418,16 +380,6 @@ $(KUBEBUILDER): $(LOCALBIN)
 	curl -L -o $(LOCALBIN)/kubebuilder https://github.com/kubernetes-sigs/kubebuilder/releases/download/$(KUBEBUILDER_VERSION)/kubebuilder_$(OS)_$(ARCH_SHORT)
 	chmod +x $(LOCALBIN)/kubebuilder
 
-.PHONY: controller-gen
-controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
-$(CONTROLLER_GEN): $(LOCALBIN)
-	GOBIN=$(CACHE_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
-
-.PHONY: conversion-gen
-conversion-gen: $(CONVERSION_GEN) ## Download conversion-gen locally if necessary.
-$(CONVERSION_GEN): $(LOCALBIN)
-	GOBIN=$(CACHE_BIN) go install k8s.io/code-generator/cmd/conversion-gen@$(CONVERSION_GEN_VERSION)
-
 .PHONY: tilt
 tilt: $(TILT) ## Download tilt locally if necessary.
 $(TILT): $(LOCALBIN)
@@ -443,47 +395,7 @@ $(KIND): $(LOCALBIN)
 	curl -Lso $(KIND) https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(ARCH_SHORT)
 	chmod +x $(KIND)
 
-.PHONY: chainsaw
-chainsaw: $(CHAINSAW) ## Download chainsaw locally if necessary.
-$(CHAINSAW): $(CACHE_BIN)
-	GOBIN=$(CACHE_BIN) go install github.com/kyverno/chainsaw@$(CHAINSAW_VERSION)
-
-.PHONY: envtest
-envtest: $(ENVTEST) ## Download setup-envtest locally if necessary.
-$(ENVTEST): $(CACHE_BIN)
-	GOBIN=$(CACHE_BIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
-
-.phony: golangci-lint
-golangci-lint: $(GOLANGCI_LINT)
-$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
-	GOBIN=$(LOCALBIN)  go install  github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
-
-.phony: golangci-lint-kal
+.PHONY: golangci-lint-kal
 golangci-lint-kal: $(GOLANGCI_LINT_KAL)
-$(GOLANGCI_LINT_KAL): $(GOLANGCI_LINT) # Build golangci-lint-kal from custom configuration.
-	$(GOLANGCI_LINT) custom
-
-.PHONY: nilaway
-nilaway: $(NILAWAY) ## Download nilaway locally if necessary.
-$(NILAWAY): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install go.uber.org/nilaway/cmd/nilaway@$(NILAWAY_VERSION)
-
-.PHONY: govulncheck
-govulncheck: $(GOVULNC) ## Download govulncheck locally if necessary.
-$(GOVULNC): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install golang.org/x/vuln/cmd/govulncheck@$(GOVULNC_VERSION)
-
-.PHONY: mockgen
-mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
-$(MOCKGEN): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen@$(MOCKGEN_VERSION)
-
-.PHONY: gowrap
-gowrap: $(GOWRAP) ## Download gowrap locally if necessary.
-$(GOWRAP): $(CACHE_BIN)
-	GOBIN=$(CACHE_BIN) go install github.com/hexdigest/gowrap/cmd/gowrap@$(GOWRAP_VERSION)
-
-.PHONY: s5cmd
-s5cmd: $(S5CMD)
-$(S5CMD): $(CACHE_BIN)
-	GOBIN=$(CACHE_BIN) go install github.com/peak/s5cmd/v2@$(S5CMD_VERSION)
+$(GOLANGCI_LINT_KAL): tools # Build golangci-lint-kal from custom configuration.
+	golangci-lint custom

config/crd/bases/infrastructure.cluster.x-k8s.io_addresssets.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
   name: addresssets.infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_firewallrules.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
   name: firewallrules.infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: linodeclusters.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: linodeclustertemplates.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_linodefirewalls.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
   name: linodefirewalls.infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: linodemachines.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.19.0
   labels:
     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
   name: linodemachinetemplates.infrastructure.cluster.x-k8s.io