From 6d8f4cbbbadf55ffc985a0b954ab2c4a59e7a242 Mon Sep 17 00:00:00 2001 From: Wei Weng Date: Tue, 4 Nov 2025 14:41:13 +0000 Subject: [PATCH] use go 1.24.9 for CVEs Signed-off-by: Wei Weng --- .github/workflows/ci.yml | 2 +- .github/workflows/code-lint.yml | 2 +- .github/workflows/trivy.yml | 2 +- .github/workflows/upgrade.yml | 2 +- .golangci.yml | 2 +- Makefile | 2 +- apis/protos/azure/compute/v1/vmsizerecommender.pb.go | 5 +++-- apis/protos/azure/compute/v1/vmsizerecommender_grpc.pb.go | 1 + docker/crd-installer.Dockerfile | 2 +- docker/hub-agent.Dockerfile | 2 +- docker/member-agent.Dockerfile | 2 +- docker/refresh-token.Dockerfile | 2 +- go.mod | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da8a87a46..9dd5d6dfa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: paths-ignore: [docs/**, "**.md", "**.mdx", "**.png", "**.jpg"] env: - GO_VERSION: '1.24.6' + GO_VERSION: '1.24.9' jobs: detect-noop: diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml index df2862a9d..2f865a75f 100644 --- a/.github/workflows/code-lint.yml +++ b/.github/workflows/code-lint.yml @@ -14,7 +14,7 @@ on: env: # Common versions - GO_VERSION: '1.24.6' + GO_VERSION: '1.24.9' jobs: diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index ca21beb6e..e5c9e7f46 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -18,7 +18,7 @@ env: MEMBER_AGENT_IMAGE_NAME: member-agent REFRESH_TOKEN_IMAGE_NAME: refresh-token - GO_VERSION: '1.24.6' + GO_VERSION: '1.24.9' jobs: export-registry: diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml index c8a688f11..ee99472e2 100644 --- a/.github/workflows/upgrade.yml +++ b/.github/workflows/upgrade.yml @@ -17,7 +17,7 @@ on: paths-ignore: [docs/**, "**.md", "**.mdx", "**.png", "**.jpg"] env: - GO_VERSION: '1.24.6' + GO_VERSION: '1.24.9' jobs: detect-noop: diff --git a/.golangci.yml b/.golangci.yml index e0919ecc4..a1b9bbc3a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: timeout: 15m - go: '1.24.6' + go: '1.24.9' linters-settings: stylecheck: diff --git a/Makefile b/Makefile index 85c1e3775..8e8d15e29 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ CONTROLLER_GEN_VER := v0.16.0 CONTROLLER_GEN_BIN := controller-gen CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)) -STATICCHECK_VER := 2025.1 +STATICCHECK_VER := master STATICCHECK_BIN := staticcheck STATICCHECK := $(abspath $(TOOLS_BIN_DIR)/$(STATICCHECK_BIN)-$(STATICCHECK_VER)) diff --git a/apis/protos/azure/compute/v1/vmsizerecommender.pb.go b/apis/protos/azure/compute/v1/vmsizerecommender.pb.go index 543b75155..243b11763 100644 --- a/apis/protos/azure/compute/v1/vmsizerecommender.pb.go +++ b/apis/protos/azure/compute/v1/vmsizerecommender.pb.go @@ -11,11 +11,12 @@ package v1 import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" unsafe "unsafe" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/apis/protos/azure/compute/v1/vmsizerecommender_grpc.pb.go b/apis/protos/azure/compute/v1/vmsizerecommender_grpc.pb.go index 9d00f1924..b3205246b 100644 --- a/apis/protos/azure/compute/v1/vmsizerecommender_grpc.pb.go +++ b/apis/protos/azure/compute/v1/vmsizerecommender_grpc.pb.go @@ -12,6 +12,7 @@ package v1 import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/docker/crd-installer.Dockerfile b/docker/crd-installer.Dockerfile index b46359543..3055a235f 100644 --- a/docker/crd-installer.Dockerfile +++ b/docker/crd-installer.Dockerfile @@ -1,5 +1,5 @@ # Build the crdinstaller binary -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.6 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.9 AS builder ARG GOOS=linux ARG GOARCH=amd64 diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile index a073f4d38..d03fcc093 100644 --- a/docker/hub-agent.Dockerfile +++ b/docker/hub-agent.Dockerfile @@ -1,5 +1,5 @@ # Build the hubagent binary -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.6 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.9 AS builder ARG GOOS=linux ARG GOARCH=amd64 diff --git a/docker/member-agent.Dockerfile b/docker/member-agent.Dockerfile index b7a9600f3..b28b2cdff 100644 --- a/docker/member-agent.Dockerfile +++ b/docker/member-agent.Dockerfile @@ -1,5 +1,5 @@ # Build the memberagent binary -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.6 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.9 AS builder ARG GOOS=linux ARG GOARCH=amd64 diff --git a/docker/refresh-token.Dockerfile b/docker/refresh-token.Dockerfile index 085302096..4d7aa7d83 100644 --- a/docker/refresh-token.Dockerfile +++ b/docker/refresh-token.Dockerfile @@ -1,5 +1,5 @@ # Build the refreshtoken binary -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.6 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.24.9 AS builder ARG GOOS="linux" ARG GOARCH="amd64" diff --git a/go.mod b/go.mod index 41d7e276c..959929884 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.goms.io/fleet -go 1.24.6 +go 1.24.9 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0