diff --git a/.circleci/config.yml b/.circleci/config.yml index 20e7e3a7eeb6f..7ccdabf419096 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:v34815905-ae40295e + - image: gcr.io/datadoghq/agent-circleci-runner:v35901572-a9447181 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 75ead15d5d1c5..a025eb40d783b 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: v34815905-ae40295e + DATADOG_AGENT_BUILDIMAGES: v35901572-a9447181 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_WINBUILDIMAGES: v35901572-a9447181 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_ARMBUILDIMAGES: v35901572-a9447181 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v35901572-a9447181 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v35901572-a9447181 DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d diff --git a/.go-version b/.go-version index ae7bbdf047aa9..88863fd8e3678 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.10 +1.21.11 diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index 68f99c0934a70..d0415799055c3 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.10" +$go_version = "1.21.11" 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 933ab741a2feb..bdc5b47e6127e 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -109,7 +109,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.21.10` or +You must [install Golang](https://golang.org/doc/install) version `1.21.11` 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.11-90571ee14ed4f7dd.yaml b/releasenotes/notes/bump-go-to-1.21.11-90571ee14ed4f7dd.yaml new file mode 100644 index 0000000000000..33f57a68c40d1 --- /dev/null +++ b/releasenotes/notes/bump-go-to-1.21.11-90571ee14ed4f7dd.yaml @@ -0,0 +1,4 @@ +--- +enhancements: +- | + Agents are now built with Go ``1.21.11``. diff --git a/tasks/go.py b/tasks/go.py index ff4da70637c45..243da5acb607e 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -436,7 +436,7 @@ def tidy(ctx): @task def check_go_version(ctx): go_version_output = ctx.run('go version') - # result is like "go version go1.21.10 linux/amd64" + # result is like "go version go1.21.11 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 b9441a5af0211..81827ca930919 100644 --- a/test/fakeintake/Dockerfile +++ b/test/fakeintake/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 ## Build -FROM golang:1.21.10-alpine3.18 AS build +FROM golang:1.21.11-alpine3.20 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 31ec75683b56b..b835c2a72a8a9 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.10.linux-amd64.tar.gz +RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.21.11.linux-amd64.tar.gz RUN tar xzvf golang.tgz RUN ln -s /go /goroot