Skip to content

Commit 7c3372a

Browse files
thampiotrthampiotr
authored
Upgrade Go to 1.22.1 (#6646)
* Upgrade Go to 1.22.1 * update build images
1 parent a28e159 commit 7c3372a

File tree

14 files changed

+75
-73
lines changed

14 files changed

+75
-73
lines changed

‎.drone/drone.yml

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Main (unreleased)
3333

3434
- Clustering for Grafana Agent in Flow mode has graduated from beta to stable.
3535

36+
- Upgrade to Go 1.22.1 (@thampiotr)
37+
3638
v0.40.2 (2024-03-05)
3739
--------------------
3840

‎build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
55
# in environment variables.
66

7-
# NOTE: The GO_RUNTIME is used to switch between the default google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye which is a microsoft
7+
# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye which is a Microsoft
88
# fork of go that allows using windows crypto instead of boring crypto. Details at https://github.com/microsoft/go/tree/microsoft/main/eng/doc/fips
99
ARG GO_RUNTIME=mustoverride
1010

‎build-image/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM library/golang:1.22.0-windowsservercore-1809
1+
FROM library/golang:1.22.1-windowsservercore-1809
22

33
SHELL ["powershell", "-command"]
44

‎cmd/grafana-agent-operator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
55
# in environment variables.
66

7-
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.33.0 as build
7+
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.40.2 as build
88
ARG BUILDPLATFORM
99
ARG TARGETPLATFORM
1010
ARG TARGETOS

‎cmd/grafana-agent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
55
# in environment variables.
66

7-
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.33.0 as build
7+
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.40.2 as build
88
ARG BUILDPLATFORM
99
ARG TARGETPLATFORM
1010
ARG TARGETOS

‎cmd/grafana-agent/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/agent-build-image:0.33.0-windows as builder
1+
FROM grafana/agent-build-image:0.40.2-windows as builder
22
ARG VERSION
33
ARG RELEASE_BUILD=1
44

‎cmd/grafana-agentctl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
55
# in environment variables.
66

7-
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.33.0 as build
7+
FROM --platform=$BUILDPLATFORM grafana/agent-build-image:0.40.2 as build
88
ARG BUILDPLATFORM
99
ARG TARGETPLATFORM
1010
ARG TARGETOS

‎cmd/grafana-agentctl/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/agent-build-image:0.33.0-windows as builder
1+
FROM grafana/agent-build-image:0.40.2-windows as builder
22
ARG VERSION
33
ARG RELEASE_BUILD=1
44

‎docs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ include docs.mk
1111
docs: check-cloudwatch-integration
1212

1313
check-cloudwatch-integration:
14-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
15-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
14+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
15+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
1616

1717
generate-cloudwatch-integration:
18-
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.21-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
18+
$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.22.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
1919

2020
sources/assets/hierarchy.svg: sources/operator/hierarchy.dot
2121
cat $< | $(PODMAN) run --rm -i nshine/dot dot -Tsvg > $@

0 commit comments

Comments
 (0)