From 682202444c09a304e9a1da203e9552ab9f19a166 Mon Sep 17 00:00:00 2001 From: Lucas Manuel Rodriguez Date: Mon, 20 Apr 2026 13:40:57 -0300 Subject: [PATCH] Update go to 1.26.2 and update tooling to update it (#43771) Golang 1.26.2 has been released. It fixes some CVEs: https://github.com/golang/go/issues?q=milestone%3AGo1.26.2+label%3ACherryPickApproved ## Summary by CodeRabbit * **Chores** * Updated Go toolchain to 1.26.2 across the repository and build configs. * Updated Docker build images to use Go 1.26.2. * Expanded the set of tracked modules for the Go version update so additional module files are included in automated updates. --- Dockerfile-desktop-linux | 2 +- Makefile | 12 +++++++++++- changes/update-go-1.26.2 | 1 + go.mod | 2 +- .../loadtesting/terraform/docker/loadtest.Dockerfile | 2 +- orbit/changes/update-go-1.26.2 | 1 + third_party/goval-dictionary/go.mod | 2 +- third_party/vuln-check/go.mod | 2 +- tools/ci/setboolcheck/go.mod | 2 +- tools/fleet-mcp/go.mod | 2 +- tools/github-manage/go.mod | 2 +- tools/mdm/migration/mdmproxy/Dockerfile | 2 +- tools/mdm/windows/bitlocker/go.mod | 2 +- tools/qacheck/go.mod | 2 +- tools/snapshot/go.mod | 2 +- tools/terraform/go.mod | 2 +- 16 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 changes/update-go-1.26.2 create mode 100644 orbit/changes/update-go-1.26.2 diff --git a/Dockerfile-desktop-linux b/Dockerfile-desktop-linux index 81f526a2a5..9cce3907e5 100644 --- a/Dockerfile-desktop-linux +++ b/Dockerfile-desktop-linux @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.26.1-trixie@sha256:96b28783b99bcd265fbfe0b36a3ac6462416ce6bf1feac85d4c4ff533cbaa473 +FROM --platform=linux/amd64 golang:1.26.2-trixie@sha256:b53c282df83967299380adbd6a2dc67e750a58217f39285d6240f6f80b19eaad LABEL maintainer="Fleet Developers" RUN apt-get update && apt-get install -y musl-tools && rm -rf /var/lib/apt/lists/* diff --git a/Makefile b/Makefile index b1dee06822..b4f7bd5684 100644 --- a/Makefile +++ b/Makefile @@ -940,7 +940,17 @@ vex-report: # make update-go version=1.24.4 UPDATE_GO_DOCKERFILES := ./Dockerfile-desktop-linux ./infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile ./tools/mdm/migration/mdmproxy/Dockerfile -UPDATE_GO_MODS := go.mod ./tools/mdm/windows/bitlocker/go.mod ./tools/snapshot/go.mod ./tools/terraform/go.mod +UPDATE_GO_MODS := \ + go.mod \ + ./tools/mdm/windows/bitlocker/go.mod \ + ./tools/snapshot/go.mod \ + ./tools/terraform/go.mod \ + ./third_party/vuln-check/go.mod \ + ./tools/ci/setboolcheck/go.mod \ + ./tools/github-manage/go.mod \ + ./tools/qacheck/go.mod \ + ./third_party/goval-dictionary/go.mod \ + ./tools/fleet-mcp/go.mod update-go: @test $(version) || (echo "Mising 'version' argument, usage: 'make update-go version=1.24.4'" ; exit 1) @for dockerfile in $(UPDATE_GO_DOCKERFILES) ; do \ diff --git a/changes/update-go-1.26.2 b/changes/update-go-1.26.2 new file mode 100644 index 0000000000..082b264f73 --- /dev/null +++ b/changes/update-go-1.26.2 @@ -0,0 +1 @@ +* Updated go to 1.26.2 diff --git a/go.mod b/go.mod index 5f0c7810eb..7ee87114aa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fleetdm/fleet/v4 -go 1.26.1 +go 1.26.2 require ( cloud.google.com/go/pubsub v1.50.1 diff --git a/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile b/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile index 18bd539020..b010f86bd9 100644 --- a/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile +++ b/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.1-alpine3.23@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 +FROM golang:1.26.2-alpine3.23@sha256:80fbb8f9b2fa541a7d34378f1ad10f4f1c433817c4ed39ddb3e2f3ec3e961271 ARG TAG RUN apk add git sqlite gcc musl-dev sqlite-dev RUN git clone -b $TAG --depth=1 --no-tags --progress --no-recurse-submodules https://github.com/fleetdm/fleet.git && cd /go/fleet/cmd/osquery-perf/ && go build . diff --git a/orbit/changes/update-go-1.26.2 b/orbit/changes/update-go-1.26.2 new file mode 100644 index 0000000000..082b264f73 --- /dev/null +++ b/orbit/changes/update-go-1.26.2 @@ -0,0 +1 @@ +* Updated go to 1.26.2 diff --git a/third_party/goval-dictionary/go.mod b/third_party/goval-dictionary/go.mod index 164fc6319b..6f718cc9e0 100644 --- a/third_party/goval-dictionary/go.mod +++ b/third_party/goval-dictionary/go.mod @@ -1,6 +1,6 @@ module github.com/vulsio/goval-dictionary -go 1.24.0 +go 1.26.2 require ( github.com/cheggaaa/pb/v3 v3.1.7 diff --git a/third_party/vuln-check/go.mod b/third_party/vuln-check/go.mod index db24858e92..9670c5640b 100644 --- a/third_party/vuln-check/go.mod +++ b/third_party/vuln-check/go.mod @@ -9,7 +9,7 @@ module github.com/fleetdm/fleet/v4/third_party/vuln-check -go 1.26.1 +go 1.26.2 require ( // NanoMDM - Apple MDM server (server/mdm/nanomdm/) diff --git a/tools/ci/setboolcheck/go.mod b/tools/ci/setboolcheck/go.mod index a20e7dd8bc..0dc55a3c1e 100644 --- a/tools/ci/setboolcheck/go.mod +++ b/tools/ci/setboolcheck/go.mod @@ -1,6 +1,6 @@ module github.com/fleetdm/fleet/v4/tools/ci/setboolcheck -go 1.26.1 +go 1.26.2 require ( github.com/golangci/plugin-module-register v0.1.2 diff --git a/tools/fleet-mcp/go.mod b/tools/fleet-mcp/go.mod index ddc3d43c11..6b4fad0828 100644 --- a/tools/fleet-mcp/go.mod +++ b/tools/fleet-mcp/go.mod @@ -1,6 +1,6 @@ module fleet-mcp -go 1.25.7 +go 1.26.2 require ( github.com/joho/godotenv v1.5.1 diff --git a/tools/github-manage/go.mod b/tools/github-manage/go.mod index 2d07143580..57129d3677 100644 --- a/tools/github-manage/go.mod +++ b/tools/github-manage/go.mod @@ -1,6 +1,6 @@ module fleetdm/gm -go 1.26.1 +go 1.26.2 require ( github.com/charmbracelet/bubbles v0.21.0 diff --git a/tools/mdm/migration/mdmproxy/Dockerfile b/tools/mdm/migration/mdmproxy/Dockerfile index 668f92c750..ea5a0437f1 100644 --- a/tools/mdm/migration/mdmproxy/Dockerfile +++ b/tools/mdm/migration/mdmproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.1-alpine3.23@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 +FROM golang:1.26.2-alpine3.23@sha256:80fbb8f9b2fa541a7d34378f1ad10f4f1c433817c4ed39ddb3e2f3ec3e961271 ARG TAG RUN apk update && apk add --no-cache git RUN git clone -b $TAG --depth=1 --no-tags --progress --no-recurse-submodules https://github.com/fleetdm/fleet.git && cd /go/fleet/tools/mdm/migration/mdmproxy && go build . diff --git a/tools/mdm/windows/bitlocker/go.mod b/tools/mdm/windows/bitlocker/go.mod index d201dbcecb..2f7ceaf791 100755 --- a/tools/mdm/windows/bitlocker/go.mod +++ b/tools/mdm/windows/bitlocker/go.mod @@ -1,6 +1,6 @@ module bitlocker -go 1.26.1 +go 1.26.2 require github.com/go-ole/go-ole v1.3.0 diff --git a/tools/qacheck/go.mod b/tools/qacheck/go.mod index bc0b077227..959ad48c55 100644 --- a/tools/qacheck/go.mod +++ b/tools/qacheck/go.mod @@ -1,6 +1,6 @@ module qacheck -go 1.26.1 +go 1.26.2 require ( github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed diff --git a/tools/snapshot/go.mod b/tools/snapshot/go.mod index 823f46e13c..98fe0cb4da 100644 --- a/tools/snapshot/go.mod +++ b/tools/snapshot/go.mod @@ -1,6 +1,6 @@ module github.com/fleetdm/fleet/v4/tools/snapshot -go 1.26.1 +go 1.26.2 require ( github.com/manifoldco/promptui v0.9.0 diff --git a/tools/terraform/go.mod b/tools/terraform/go.mod index 5a184dfbcd..1491308334 100644 --- a/tools/terraform/go.mod +++ b/tools/terraform/go.mod @@ -1,6 +1,6 @@ module terraform-provider-fleetdm -go 1.26.1 +go 1.26.2 require ( github.com/hashicorp/terraform-plugin-framework v1.7.0