Update go rc (#2456)

* update build image to 1.23.5 (#2449) * cherrypick commits
grafana · Jan 20, 2025 · 954130d · 954130d
1 parent 34fc871
commit 954130d
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 46 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -10,7 +10,7 @@ steps:
   - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   - docker buildx create --name multiarch --driver docker-container --use
-  - docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform
+  - docker buildx build --build-arg="GO_RUNTIME=golang:1.23.5-bullseye" --push --platform
     linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image
   environment:
     DOCKER_LOGIN:
@@ -44,7 +44,7 @@ steps:
   - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   - docker buildx create --name multiarch --driver docker-container --use
-  - docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye"
+  - docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye"
     --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG
     ./tools/build-image
   environment:
@@ -110,7 +110,7 @@ steps:
 - commands:
   - apt-get update -y && apt-get install -y libsystemd-dev
   - make lint
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Lint
 trigger:
   event:
@@ -125,7 +125,7 @@ platform:
 steps:
 - commands:
   - make GO_TAGS="nodocker" test
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Run Go tests
 trigger:
   event:
@@ -140,7 +140,7 @@ platform:
 steps:
 - commands:
   - K8S_USE_DOCKER_NETWORK=1 make test
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Run Go tests
   volumes:
   - name: docker
@@ -164,7 +164,7 @@ steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork"
     ./...'''
-  image: grafana/alloy-build-image:v0.1.7-windows
+  image: grafana/alloy-build-image:v0.1.8-windows
   name: Run Go tests
 trigger:
   ref:
@@ -179,7 +179,7 @@ platform:
 steps:
 - commands:
   - make alloy-image
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build container
   volumes:
   - name: docker
@@ -205,7 +205,7 @@ platform:
 steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
-  image: grafana/alloy-build-image:v0.1.7-windows
+  image: grafana/alloy-build-image:v0.1.8-windows
   name: Build container
   volumes:
   - name: docker
@@ -232,7 +232,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -249,7 +249,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -266,7 +266,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -283,7 +283,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -299,7 +299,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -315,7 +315,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -331,7 +331,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -347,7 +347,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Build
 trigger:
   event:
@@ -364,7 +364,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.7-boringcrypto
+  image: grafana/alloy-build-image:v0.1.8-boringcrypto
   name: Build
 trigger:
   event:
@@ -381,7 +381,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.7-boringcrypto
+  image: grafana/alloy-build-image:v0.1.8-boringcrypto
   name: Build
 trigger:
   event:
@@ -397,7 +397,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Configure QEMU
   volumes:
   - name: docker
@@ -417,7 +417,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Publish container
   volumes:
   - name: docker
@@ -440,7 +440,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Configure QEMU
   volumes:
   - name: docker
@@ -460,7 +460,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Publish container
   volumes:
   - name: docker
@@ -494,7 +494,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7-windows
+  image: grafana/alloy-build-image:v0.1.8-windows
   name: Build containers
   volumes:
   - name: docker
@@ -517,7 +517,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Configure QEMU
   volumes:
   - name: docker
@@ -537,7 +537,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Publish container
   volumes:
   - name: docker
@@ -560,7 +560,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Configure QEMU
   volumes:
   - name: docker
@@ -580,7 +580,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Publish container
   volumes:
   - name: docker
@@ -614,7 +614,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.7-windows
+  image: grafana/alloy-build-image:v0.1.8-windows
   name: Build containers
   volumes:
   - name: docker
@@ -715,7 +715,7 @@ steps:
       from_secret: gpg_private_key
     GPG_PUBLIC_KEY:
       from_secret: gpg_public_key
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Publish release
   volumes:
   - name: docker
@@ -738,7 +738,7 @@ steps:
 - commands:
   - DOCKER_OPTS="" make dist/alloy-linux-amd64
   - DOCKER_OPTS="" make test-packages
-  image: grafana/alloy-build-image:v0.1.7
+  image: grafana/alloy-build-image:v0.1.8
   name: Test Linux system packages
   volumes:
   - name: docker
@@ -836,6 +836,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 760087c49893d6970a81c973518d26b582c3d4673d3c28b90553361de8b6e03a
+hmac: 5c0ba3650cd2bbdccc1b19b96b07ac8f76d78b4dcd461dddc140857a86db1900
 
 ...
diff --git a/.drone/pipelines/build_images.jsonnet b/.drone/pipelines/build_images.jsonnet
@@ -32,7 +32,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{
@@ -55,7 +55,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{

diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml
@@ -33,7 +33,7 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=golang:1.23.3-bullseye
+            GO_RUNTIME=golang:1.23.5-bullseye
 
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v6
@@ -42,4 +42,4 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.5-bullseye
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
-v1.6.0-rc.1
+v1.6.0-rc.2
 -----------------
 
 ### Breaking changes
@@ -166,6 +166,8 @@ v1.6.0-rc.1
     This mechanism use the AWS MSK IAM SASL Signer for Go https://github.com/aws/aws-msk-iam-sasl-signer-go.
     https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32500
 
+  - Use Go 1.23.5 for builds. (@wildum)
+
 v1.5.1
 -----------------
 

diff --git a/Dockerfile b/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/alloy-build-image:v0.1.7 as build
+FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.8 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETOS

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -1,4 +1,4 @@
-FROM grafana/alloy-build-image:v0.1.7-windows as builder
+FROM grafana/alloy-build-image:v0.1.8-windows as builder
 ARG VERSION
 ARG RELEASE_BUILD=1
 ARG GO_TAGS

diff --git a/docs/Makefile b/docs/Makefile
@@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
 endif
 
 check-cloudwatch-integration:
-	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
+	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
 
 generate-cloudwatch-integration:
-	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
+	$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/alloy
 
-go 1.23.3
+go 1.23.5
 
 require (
 	cloud.google.com/go/pubsub v1.40.0

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.23.3 as build
+FROM golang:1.23.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/

diff --git a/internal/cmd/integration-tests/configs/otel-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.3 as build
+FROM golang:1.23.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/

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.23.3 as build
+FROM golang:1.23.5 as build
 WORKDIR /app/
 COPY go.mod go.sum ./
 COPY syntax/go.mod syntax/go.sum ./syntax/

diff --git a/tools/build-image/windows/Dockerfile b/tools/build-image/windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM library/golang:1.23.3-windowsservercore-1809
+FROM library/golang:1.23.5-windowsservercore-1809
 
 SHELL ["powershell", "-command"]
 

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 ?= v0.1.7
+BUILD_IMAGE_VERSION ?= v0.1.8
 BUILD_IMAGE         ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
 DOCKER_OPTS         ?= -it