From 6baeb27353dc2f0242fbbd8aafb92bf7183d8709 Mon Sep 17 00:00:00 2001 From: jeremy-hanna Date: Wed, 8 May 2024 21:29:25 +0000 Subject: [PATCH 1/3] Update Go version to 1.21.10 --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 10 +++++----- .go-version | 2 +- devenv/scripts/Install-DevEnv.ps1 | 2 +- docs/dev/agent_dev_env.md | 2 +- .../notes/bump-go-to-1.21.10-7961a5d2bae4eccb.yaml | 4 ++++ tasks/go.py | 2 +- test/fakeintake/Dockerfile | 2 +- tools/gdb/Dockerfile | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/bump-go-to-1.21.10-7961a5d2bae4eccb.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 64ca40e2ddd35..fa3fe7961e549 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v32778237-8467c81e + - image: gcr.io/datadoghq/agent-circleci-runner:v33908179-6b084e8e environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dc8c1f00082..ed1942f5c9f8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,15 +164,15 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v32778237-8467c81e + DATADOG_AGENT_BUILDIMAGES: v33908179-6b084e8e DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v32778237-8467c81e + DATADOG_AGENT_WINBUILDIMAGES: v33908179-6b084e8e DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v32778237-8467c81e + DATADOG_AGENT_ARMBUILDIMAGES: v33908179-6b084e8e DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v32778237-8467c81e + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v33908179-6b084e8e DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v32778237-8467c81e + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v33908179-6b084e8e DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: ad9589b7 diff --git a/.go-version b/.go-version index f124bfa155441..ae7bbdf047aa9 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.9 +1.21.10 diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index 2d48d5b963eaf..68f99c0934a70 100644 --- a/devenv/scripts/Install-DevEnv.ps1 +++ b/devenv/scripts/Install-DevEnv.ps1 @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' -$go_version = "1.21.9" +$go_version = "1.21.10" Write-Host -ForegroundColor Green "Installing go $go_version" $gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip" diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md index a4fdd16ebbc98..70d922278b01d 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -86,7 +86,7 @@ It will also pull other handy development tools/deps (`reno`, or `docker`). ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.21.9` or +You must [install Golang](https://golang.org/doc/install) version `1.21.10` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. diff --git a/releasenotes/notes/bump-go-to-1.21.10-7961a5d2bae4eccb.yaml b/releasenotes/notes/bump-go-to-1.21.10-7961a5d2bae4eccb.yaml new file mode 100644 index 0000000000000..75b518bb68887 --- /dev/null +++ b/releasenotes/notes/bump-go-to-1.21.10-7961a5d2bae4eccb.yaml @@ -0,0 +1,4 @@ +--- +enhancements: +- | + Agents are now built with Go ``1.21.10``. diff --git a/tasks/go.py b/tasks/go.py index 6494f3e68433f..74a4264f59dd6 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -406,7 +406,7 @@ def tidy_all(ctx): @task def check_go_version(ctx): go_version_output = ctx.run('go version') - # result is like "go version go1.21.9 linux/amd64" + # result is like "go version go1.21.10 linux/amd64" running_go_version = go_version_output.stdout.split(' ')[2] with open(".go-version") as f: diff --git a/test/fakeintake/Dockerfile b/test/fakeintake/Dockerfile index 4adba018ba9f5..b9441a5af0211 100644 --- a/test/fakeintake/Dockerfile +++ b/test/fakeintake/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 ## Build -FROM golang:1.21.9-alpine3.18 AS build +FROM golang:1.21.10-alpine3.18 AS build # need gcc to build with CGO_ENABLED=1 # need musl-dev to get stdlib.h diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile index 89e156fdaf5b3..31ec75683b56b 100644 --- a/tools/gdb/Dockerfile +++ b/tools/gdb/Dockerfile @@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim # Install go -RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.21.9.linux-amd64.tar.gz +RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.21.10.linux-amd64.tar.gz RUN tar xzvf golang.tgz RUN ln -s /go /goroot From 6b8a616551e667cc39e8868993196930d634878b Mon Sep 17 00:00:00 2001 From: pgimalac Date: Fri, 10 May 2024 14:13:42 +0000 Subject: [PATCH 2/3] Update buildimages ID to v33917874-6fe9338e --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa3fe7961e549..0bf69a0c11c0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v33908179-6b084e8e + - image: gcr.io/datadoghq/agent-circleci-runner:v33917874-6fe9338e environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed1942f5c9f8c..1d135194acd01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,15 +164,15 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v33908179-6b084e8e + DATADOG_AGENT_BUILDIMAGES: v33917874-6fe9338e DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v33908179-6b084e8e + DATADOG_AGENT_WINBUILDIMAGES: v33917874-6fe9338e DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v33908179-6b084e8e + DATADOG_AGENT_ARMBUILDIMAGES: v33917874-6fe9338e DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v33908179-6b084e8e + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v33917874-6fe9338e DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v33908179-6b084e8e + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v33917874-6fe9338e DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: ad9589b7 From c031fe8169037b7cfc2284cbb42cf4e5596e3df1 Mon Sep 17 00:00:00 2001 From: Pierre Gimalac Date: Mon, 13 May 2024 14:27:16 +0200 Subject: [PATCH 3/3] empty commit