diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fb5d0e7696e3..6a6508c67a5da 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:v49173584-da48ad73 + - image: gcr.io/datadoghq/agent-circleci-runner:v51662543-bc5e2989 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 d30592dcde060..e909428e16748 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,19 +156,19 @@ 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: v49173584-da48ad73 + DATADOG_AGENT_BUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_WINBUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_ARMBUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_NIKOS_BUILDIMAGES: v51662543-bc5e2989 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v49173584-da48ad73 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v51662543-bc5e2989 # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" diff --git a/.go-version b/.go-version index f124bfa155441..88863fd8e3678 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.9 +1.21.11 diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index 2d48d5b963eaf..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.9" +$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 a4fdd16ebbc98..533c739ff2576 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.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 028532b2eba07..74339919c38b7 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -401,7 +401,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.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 32ccf4032434f..55d8858a202f3 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.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 89e156fdaf5b3..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.9.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