upgrade go version to 1.22.11 (#7096)

grafana · Jan 20, 2025 · 23f0e7f · 23f0e7f
1 parent 3a1a904
commit 23f0e7f
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 70 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
-v0.44.0-rc.0 (2024-12-19)
+v0.44.0-rc.1 (2024-01-20)
 -------------------------
 
 ### Bugfixes
@@ -30,6 +30,8 @@ v0.44.0-rc.0 (2024-12-19)
 - Remove setcap for `cap_net_bind_service` to allow Agent to run in restricted environments.
   Modern container runtimes allow binding to unprivileged ports as non-root. (@ptodev)
 
+- Update to go 1.22.11 (@wildum)
+
 v0.43.4 (2024-11-25)
 -----------------
 

diff --git a/cmd/grafana-agent-operator/Dockerfile b/cmd/grafana-agent-operator/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.2 as build
+FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.3 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETOS

diff --git a/cmd/grafana-agent/Dockerfile b/cmd/grafana-agent/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.2 as build
+FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.3 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETOS

diff --git a/cmd/grafana-agent/Dockerfile.windows b/cmd/grafana-agent/Dockerfile.windows
@@ -1,4 +1,4 @@
-FROM grafana/agent-build-image:0.41.2-windows as builder
+FROM grafana/agent-build-image:0.41.3-windows as builder
 ARG VERSION
 ARG RELEASE_BUILD=1
 

diff --git a/cmd/grafana-agentctl/Dockerfile b/cmd/grafana-agentctl/Dockerfile
@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.2 as build
+FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.41.3 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETOS

diff --git a/cmd/grafana-agentctl/Dockerfile.windows b/cmd/grafana-agentctl/Dockerfile.windows
@@ -1,4 +1,4 @@
-FROM grafana/agent-build-image:0.41.2-windows as builder
+FROM grafana/agent-build-image:0.41.3-windows as builder
 ARG VERSION
 ARG RELEASE_BUILD=1
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/agent
 
-go 1.22.9
+go 1.22.11
 
 retract (
 	v1.3.191 // Published accidentally

diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9 as build
+FROM golang:1.22.11 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 RUN go mod download

diff --git a/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9 as build
+FROM golang:1.22.11 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 RUN go mod download

diff --git a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9 as build
+FROM golang:1.22.11 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 RUN go mod download

diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk
@@ -34,7 +34,7 @@
 # variable names should be passed through to the container.
 
 USE_CONTAINER       ?= 0
-BUILD_IMAGE_VERSION ?= 0.41.2
+BUILD_IMAGE_VERSION ?= 0.41.3
 BUILD_IMAGE         ?= grafana/agent-build-image:$(BUILD_IMAGE_VERSION)
 DOCKER_OPTS         ?= -it