From fd74988a1af168274a261bc0cf1b5c718c70e21c Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Thu, 7 Aug 2025 10:27:54 +0200 Subject: [PATCH] [release-12.0.4] Go: Update to 1.24.6 (#109317) --- .drone.yml | 54 ++++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- apps/advisor/go.mod | 2 +- apps/alerting/notifications/go.mod | 2 +- apps/dashboard/go.mod | 2 +- apps/folder/go.mod | 2 +- apps/investigations/go.mod | 2 +- apps/playlist/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- pkg/aggregator/go.mod | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apis/secret/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/codegen/go.mod | 2 +- pkg/plugins/codegen/go.mod | 2 +- pkg/promlib/go.mod | 2 +- pkg/semconv/go.mod | 2 +- pkg/storage/unified/apistore/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- pkg/util/xorm/go.mod | 2 +- scripts/drone/variables.star | 2 +- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.drone.yml b/.drone.yml index c2c570ddcca..1cd7adba7fa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: lint-starlark trigger: event: @@ -140,7 +140,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -150,7 +150,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -159,7 +159,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -210,7 +210,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-package pull: always volumes: @@ -472,7 +472,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue trigger: event: @@ -542,7 +542,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue trigger: branch: main @@ -609,7 +609,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -619,7 +619,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -628,7 +628,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -678,7 +678,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-package pull: always volumes: @@ -1156,7 +1156,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -1286,7 +1286,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -1427,7 +1427,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -1519,7 +1519,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -1619,7 +1619,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -1716,7 +1716,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -1790,7 +1790,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -1884,7 +1884,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2007,7 +2007,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2114,7 +2114,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2260,7 +2260,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-publish pull: always volumes: @@ -2390,7 +2390,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2732,7 +2732,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.5-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.6-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.16.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -2760,7 +2760,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.5-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.6-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.16.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -3007,6 +3007,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: c38baa8613d2cf1a5506f6b6568b0869204ba8b2e7281e117c31f3a64bf64447 +hmac: dcbbfb33fcbd1546e1bf3346f64fe0fd1d7c8b18bc148a93b45389273e90f6d2 ... diff --git a/Dockerfile b/Dockerfile index e14a09c8cc7..0b8b45a0d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG JS_SRC=js-builder # By using FROM instructions we can delegate dependency updates to dependabot FROM alpine:3.21.3 AS alpine-base FROM ubuntu:22.04 AS ubuntu-base -FROM golang:1.24.5-alpine AS go-builder-base +FROM golang:1.24.6-alpine AS go-builder-base FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base # Javascript build stage diff --git a/Makefile b/Makefile index a45ba4af9b8..8f1bde925e6 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.5 +GO_VERSION = 1.24.6 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod index cf851395de9..e5a523f898e 100644 --- a/apps/advisor/go.mod +++ b/apps/advisor/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/advisor -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 90c8e2efbf8..6030e9b2d02 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.24.5 +go 1.24.6 replace github.com/grafana/grafana => ../../.. diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index 6eaee0ccffc..06329dfc56b 100644 --- a/apps/dashboard/go.mod +++ b/apps/dashboard/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashboard -go 1.24.5 +go 1.24.6 require ( cuelang.org/go v0.11.1 diff --git a/apps/folder/go.mod b/apps/folder/go.mod index 566af9094cd..c64fa433e59 100644 --- a/apps/folder/go.mod +++ b/apps/folder/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/folder -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod index fae2bec8bf7..6b2fbb92e69 100644 --- a/apps/investigations/go.mod +++ b/apps/investigations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/investigations -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index d0322deb8aa..22afa52a679 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/go.mod b/go.mod index 1c793784ca6..5c17404df54 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.5 +go 1.24.6 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index c1c74ea6d70..51a6a920b60 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.5 +go 1.24.6 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index 08066d55390..49100e82138 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.24.5 +go 1.24.6 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 213bdad04f9..b6fe5da3796 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.24.5 +go 1.24.6 require ( github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team diff --git a/pkg/apis/secret/go.mod b/pkg/apis/secret/go.mod index 23b663bc040..8f2d4663659 100644 --- a/pkg/apis/secret/go.mod +++ b/pkg/apis/secret/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apis/secret -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index d1761e58afa..f8721450092 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.24.5 +go 1.24.6 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 86c4cc9fa60..ff21071e0ea 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.24.5 +go 1.24.6 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 73516c0267d..0f969304d6e 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.24.5 +go 1.24.6 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 08f9464a72e..59681aa9405 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.24.5 +go 1.24.6 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index 139334f5c48..a8cac149bfe 100644 --- a/pkg/plugins/codegen/go.mod +++ b/pkg/plugins/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins/codegen -go 1.24.5 +go 1.24.6 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index c159bde3e15..405e84925fd 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.24.5 +go 1.24.6 require ( github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 1e3d7616397..244307c8e06 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.24.5 +go 1.24.6 require go.opentelemetry.io/otel v1.36.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 02a3fd1c233..8e52a8cb3e7 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/apistore -go 1.24.5 +go 1.24.6 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index e97b8a1fb05..33bb5a42f86 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.24.5 +go 1.24.6 replace ( github.com/grafana/grafana/apps/folder => ../../../../apps/folder diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 0a3ce02d4d3..ee541f41d09 100644 --- a/pkg/util/xorm/go.mod +++ b/pkg/util/xorm/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/util/xorm -go 1.24.5 +go 1.24.6 require ( cloud.google.com/go/spanner v1.76.1 diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index c14e87833fd..7c45f17b75f 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.2" -golang_version = "1.24.5" +golang_version = "1.24.6" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "22.16.0"