diff --git a/Dockerfile b/Dockerfile index d674862ce..69b33410e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 as builder +FROM golang:1.26 as builder ARG TARGETOS ARG TARGETARCH ARG VERSION diff --git a/Makefile b/Makefile index 1dd454714..51280c839 100644 --- a/Makefile +++ b/Makefile @@ -123,8 +123,8 @@ 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:$(GOSEC_VERSION) -exclude-dir=bin -exclude-generated ./... +gosec: gosec-bin ## Run gosec against code. + $(GOSEC) -exclude-dir=bin -exclude-generated ./... .PHONY: lint lint: ## Run lint against code. @@ -355,6 +355,7 @@ CHAINSAW ?= $(LOCALBIN)/chainsaw ENVTEST ?= $(CACHE_BIN)/setup-envtest NILAWAY ?= $(LOCALBIN)/nilaway GOVULNC ?= $(LOCALBIN)/govulncheck +GOSEC ?= $(CACHE_BIN)/gosec MOCKGEN ?= $(CACHE_BIN)/mockgen GOWRAP ?= $(CACHE_BIN)/gowrap GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint @@ -417,10 +418,10 @@ CONVERSION_GEN_VERSION ?= v0.35.3 GOLANGCI_LINT_VERSION ?= v2.10.1 # renovate: datasource=github-tags depName=securego/gosec -GOSEC_VERSION ?= 2.22.11 +GOSEC_VERSION ?= 2.24.7 .PHONY: tools -tools: $(KUSTOMIZE) $(CTLPTL) $(CLUSTERCTL) $(KUBECTL) $(CONTROLLER_GEN) $(CONVERSION_GEN) $(TILT) $(KIND) $(CHAINSAW) $(ENVTEST) $(NILAWAY) $(GOVULNC) $(MOCKGEN) $(GOWRAP) +tools: $(KUSTOMIZE) $(CTLPTL) $(CLUSTERCTL) $(KUBECTL) $(CONTROLLER_GEN) $(CONVERSION_GEN) $(TILT) $(KIND) $(CHAINSAW) $(ENVTEST) $(NILAWAY) $(GOVULNC) $(GOSEC) $(MOCKGEN) $(GOWRAP) .PHONY: kustomize @@ -511,6 +512,11 @@ govulncheck: $(GOVULNC) ## Download govulncheck locally if necessary. $(GOVULNC): $(LOCALBIN) GOBIN=$(LOCALBIN) go install golang.org/x/vuln/cmd/govulncheck@$(GOVULNC_VERSION) +.PHONY: gosec-bin +gosec-bin: $(GOSEC) ## Download gosec locally if necessary. +$(GOSEC): $(CACHE_BIN) + GOBIN=$(CACHE_BIN) go install github.com/securego/gosec/v2/cmd/gosec@v$(GOSEC_VERSION) + .PHONY: mockgen mockgen: $(MOCKGEN) ## Download mockgen locally if necessary. $(MOCKGEN): $(CACHE_BIN) diff --git a/devbox.json b/devbox.json index 67d656927..ccda8650c 100644 --- a/devbox.json +++ b/devbox.json @@ -4,7 +4,7 @@ "ctlptl": "0.9.0", "docker": "29.4.0", "go-tools": "2025.1.1", - "go": "1.25.5", + "go": "1.26.1", "golangci-lint": "2.8.0", "govulncheck": "1.1.4", "kind": "0.31.0", diff --git a/devbox.lock b/devbox.lock index 2e0075197..e3a055a71 100644 --- a/devbox.lock +++ b/devbox.lock @@ -225,51 +225,51 @@ } } }, - "go@1.25.5": { - "last_modified": "2026-01-23T17:20:52Z", - "resolved": "github:NixOS/nixpkgs/a1bab9e494f5f4939442a57a58d0449a109593fe#go", + "go@1.26.1": { + "last_modified": "2026-04-16T08:46:55Z", + "resolved": "github:NixOS/nixpkgs/b86751bc4085f48661017fa226dee99fab6c651b#go", "source": "devbox-search", - "version": "1.25.5", + "version": "1.26.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/wh88zz6r1ihcp2mm7ys1f2anp8aga6n2-go-1.25.5", + "path": "/nix/store/kh43nhaz1qcpwws2xq805lrmwpmn9i3k-go-1.26.1", "default": true } ], - "store_path": "/nix/store/wh88zz6r1ihcp2mm7ys1f2anp8aga6n2-go-1.25.5" + "store_path": "/nix/store/kh43nhaz1qcpwws2xq805lrmwpmn9i3k-go-1.26.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/k3knzdi0v21bf2m7vcxpdy1jnqg1h0zk-go-1.25.5", + "path": "/nix/store/rz1pqbm5z3zfby250i0djfmfzzj7khg9-go-1.26.1", "default": true } ], - "store_path": "/nix/store/k3knzdi0v21bf2m7vcxpdy1jnqg1h0zk-go-1.25.5" + "store_path": "/nix/store/rz1pqbm5z3zfby250i0djfmfzzj7khg9-go-1.26.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/bwdahzajhqd5x14dbvkqww5f1wpsxif3-go-1.25.5", + "path": "/nix/store/yv6jj27racylbfjw6a1cdr91ndxbgyf6-go-1.26.1", "default": true } ], - "store_path": "/nix/store/bwdahzajhqd5x14dbvkqww5f1wpsxif3-go-1.25.5" + "store_path": "/nix/store/yv6jj27racylbfjw6a1cdr91ndxbgyf6-go-1.26.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/zzvsjgylnphvhms3lgr2qlwdxmc68z66-go-1.25.5", + "path": "/nix/store/ckcq2mj8zk0drhaaacy6mp9d924hnr4m-go-1.26.1", "default": true } ], - "store_path": "/nix/store/zzvsjgylnphvhms3lgr2qlwdxmc68z66-go-1.25.5" + "store_path": "/nix/store/ckcq2mj8zk0drhaaacy6mp9d924hnr4m-go-1.26.1" } } }, diff --git a/go.mod b/go.mod index cd971e126..de6386ec2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/linode/cluster-api-provider-linode -go 1.25.0 +go 1.26.0 -toolchain go1.25.9 +toolchain go1.26.2 require ( github.com/akamai/AkamaiOPEN-edgegrid-golang/v12 v12.3.0