From a6162576999c17edf43299f60311310b50a9170d Mon Sep 17 00:00:00 2001 From: William Dumont Date: Thu, 12 Sep 2024 16:26:39 +0200 Subject: [PATCH] Upgrade go to 1.22.7 and use corresponding build image (#1677) * upgrade Go 1.22.7 * upgrade build image --- .drone/drone.yml | 58 +++++++++---------- Dockerfile | 2 +- Dockerfile.windows | 2 +- docs/Makefile | 4 +- go.mod | 2 +- .../configs/kafka/Dockerfile | 2 +- .../configs/otel-metrics-gen/Dockerfile | 2 +- .../configs/prom-gen/Dockerfile | 2 +- internal/etc/datadogreceiver/go.mod | 2 +- tools/make/build-container.mk | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.drone/drone.yml b/.drone/drone.yml index cb2cf02aa5..7aa262125d 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -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.3 + image: grafana/alloy-build-image:v0.1.6 name: Lint trigger: event: @@ -125,7 +125,7 @@ platform: steps: - commands: - make GO_TAGS="nodocker" test - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 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.3 + image: grafana/alloy-build-image:v0.1.6 name: Run Go tests volumes: - name: docker @@ -163,7 +163,7 @@ platform: steps: - commands: - go test -tags="nodocker,nonetwork" ./... - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Run Go tests trigger: ref: @@ -178,7 +178,7 @@ platform: steps: - commands: - make alloy-image - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build container volumes: - name: docker @@ -204,7 +204,7 @@ platform: steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"' - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build container volumes: - name: docker @@ -231,7 +231,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.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -248,7 +248,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.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -265,7 +265,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.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -282,7 +282,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.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -298,7 +298,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -314,7 +314,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -330,7 +330,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -346,7 +346,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Build trigger: event: @@ -363,7 +363,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.3-boringcrypto + image: grafana/alloy-build-image:v0.1.6-boringcrypto name: Build trigger: event: @@ -380,7 +380,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.3-boringcrypto + image: grafana/alloy-build-image:v0.1.6-boringcrypto name: Build trigger: event: @@ -396,7 +396,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -416,7 +416,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -439,7 +439,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -459,7 +459,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -493,7 +493,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build containers volumes: - name: docker @@ -516,7 +516,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -536,7 +536,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -559,7 +559,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Configure QEMU volumes: - name: docker @@ -579,7 +579,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish container volumes: - name: docker @@ -613,7 +613,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.3-windows + image: grafana/alloy-build-image:v0.1.6-windows name: Build containers volumes: - name: docker @@ -714,7 +714,7 @@ steps: from_secret: gpg_private_key GPG_PUBLIC_KEY: from_secret: gpg_public_key - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Publish release volumes: - name: docker @@ -737,7 +737,7 @@ steps: - commands: - DOCKER_OPTS="" make dist/alloy-linux-amd64 - DOCKER_OPTS="" make test-packages - image: grafana/alloy-build-image:v0.1.3 + image: grafana/alloy-build-image:v0.1.6 name: Test Linux system packages volumes: - name: docker @@ -835,6 +835,6 @@ kind: secret name: updater_private_key --- kind: signature -hmac: b5171473370161e16d4432b2914ef8b4fa90b078f0ed9e6e531b61afa1cb0857 +hmac: 353fac6e335a14f055d7e7a43b4d40517a1b5e28b3b3ad4d4e68df82b7f013b9 ... diff --git a/Dockerfile b/Dockerfile index 8a021071f1..0eb3f1fac6 100644 --- 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.3 as build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.6 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/Dockerfile.windows b/Dockerfile.windows index cdb1a5d6cb..d5066c02d5 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/alloy-build-image:v0.1.3-windows as builder +FROM grafana/alloy-build-image:v0.1.6-windows as builder ARG VERSION ARG RELEASE_BUILD=1 ARG GO_TAGS diff --git a/docs/Makefile b/docs/Makefile index 2ea60a40c8..a1115e3208 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -11,7 +11,7 @@ include docs.mk docs: check-cloudwatch-integration check-cloudwatch-integration: - $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.5-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 -v $(shell pwd):/docs -w /repo golang:1.22.7-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 -v $(shell pwd):/docs -w /repo golang:1.22.5-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate + $(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.7-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate diff --git a/go.mod b/go.mod index 5ca20afad4..fe5a3f8ab1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy -go 1.22.5 +go 1.22.7 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 index 5c0205fcbe..a140a263b6 100644 --- a/internal/cmd/integration-tests/configs/kafka/Dockerfile +++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5 as build +FROM golang:1.22.7 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-metrics-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-metrics-gen/Dockerfile index 0d402bc156..8690f08019 100644 --- 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.5 as build +FROM golang:1.22.7 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 index 3d66ab97ae..b17ce923d4 100644 --- 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.5 as build +FROM golang:1.22.7 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ diff --git a/internal/etc/datadogreceiver/go.mod b/internal/etc/datadogreceiver/go.mod index e4df30f7e1..0cfe8d1a5c 100644 --- a/internal/etc/datadogreceiver/go.mod +++ b/internal/etc/datadogreceiver/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver -go 1.22.5 +go 1.22.7 require ( github.com/DataDog/agent-payload/v5 v5.0.115 diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk index 9c92bd45a4..96d681a7ba 100644 --- 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.3 +BUILD_IMAGE_VERSION ?= v0.1.6 BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION) DOCKER_OPTS ?= -it