[ASCII-1605] Update Go version to 1.21.10 (#25477)

Co-authored-by: pgimalac <[email protected]>
DataDog · May 13, 2024 · b10081b · b10081b
1 parent 31103d1
commit b10081b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git 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: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
@@ -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: v33917874-6fe9338e
  DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
- DATADOG_AGENT_WINBUILDIMAGES: v32778237-8467c81e
+ DATADOG_AGENT_WINBUILDIMAGES: v33917874-6fe9338e
  DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
- DATADOG_AGENT_ARMBUILDIMAGES: v32778237-8467c81e
+ DATADOG_AGENT_ARMBUILDIMAGES: v33917874-6fe9338e
  DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
- DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v32778237-8467c81e
+ DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v33917874-6fe9338e
  DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
- DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v32778237-8467c81e
+ DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v33917874-6fe9338e
 
  DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
  DEB_GPG_KEY_ID: ad9589b7

diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+---
+enhancements:
+- |
+ Agents are now built with Go ``1.21.10``.
diff --git 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
@@ -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
@@ -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