Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AGENTRUN-96] Update Go version to 1.23.6 #33934

Merged
merged 5 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: gcr.io/datadoghq/agent-circleci-runner:v54965839-ff6db30b
- image: gcr.io/datadoghq/agent-circleci-runner_test_only:v55533027-075ad767
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
88 changes: 44 additions & 44 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,51 +169,51 @@ variables:
# Build images versions
# To use images from datadog-agent-buildimages dev branches, set the corresponding
# SUFFIX variable to _test_only
DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BUILDIMAGES: v54965839-ff6db30b
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_WINBUILDIMAGES: v54965839-ff6db30b
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_ARMBUILDIMAGES: v54965839-ff6db30b
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v54965839-ff6db30b
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v54965839-ff6db30b
DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only"
GustavoCaso marked this conversation as resolved.
Show resolved Hide resolved
DATADOG_AGENT_BUILDIMAGES: v55533027-075ad767
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_WINBUILDIMAGES: v55533027-075ad767
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_ARMBUILDIMAGES: v55533027-075ad767
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55533027-075ad767
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55533027-075ad767
# New images to enable different version per image - not used yet
CI_IMAGE_BTF_GEN: v54965839-ff6db30b
CI_IMAGE_BTF_GEN_SUFFIX: ""
CI_IMAGE_DEB_X64: v54965839-ff6db30b
CI_IMAGE_DEB_X64_SUFFIX: ""
CI_IMAGE_DEB_ARM64: v54965839-ff6db30b
CI_IMAGE_DEB_ARM64_SUFFIX: ""
CI_IMAGE_DEB_ARMHF: v54965839-ff6db30b
CI_IMAGE_DEB_ARMHF_SUFFIX: ""
CI_IMAGE_DD_AGENT_TESTING: v54965839-ff6db30b
CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
CI_IMAGE_DOCKER_X64: v54965839-ff6db30b
CI_IMAGE_DOCKER_X64_SUFFIX: ""
CI_IMAGE_DOCKER_ARM64: v54965839-ff6db30b
CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
CI_IMAGE_GITLAB_AGENT_DEPLOY: v54965839-ff6db30b
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
CI_IMAGE_LINUX_GLIBC_2_17_X64: v54965839-ff6db30b
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v54965839-ff6db30b
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
CI_IMAGE_SYSTEM_PROBE_X64: v54965839-ff6db30b
CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
CI_IMAGE_SYSTEM_PROBE_ARM64: v54965839-ff6db30b
CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
CI_IMAGE_RPM_X64: v54965839-ff6db30b
CI_IMAGE_RPM_X64_SUFFIX: ""
CI_IMAGE_RPM_ARM64: v54965839-ff6db30b
CI_IMAGE_RPM_ARM64_SUFFIX: ""
CI_IMAGE_RPM_ARMHF: v54965839-ff6db30b
CI_IMAGE_RPM_ARMHF_SUFFIX: ""
CI_IMAGE_WIN_1809_X64: v54965839-ff6db30b
CI_IMAGE_WIN_1809_X64_SUFFIX: ""
CI_IMAGE_WIN_LTSC2022_X64: v54965839-ff6db30b
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
CI_IMAGE_BTF_GEN: v55533027-075ad767
CI_IMAGE_BTF_GEN_SUFFIX: "_test_only"
CI_IMAGE_DEB_X64: v55533027-075ad767
CI_IMAGE_DEB_X64_SUFFIX: "_test_only"
CI_IMAGE_DEB_ARM64: v55533027-075ad767
CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only"
CI_IMAGE_DEB_ARMHF: v55533027-075ad767
CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only"
CI_IMAGE_DD_AGENT_TESTING: v55533027-075ad767
CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only"
CI_IMAGE_DOCKER_X64: v55533027-075ad767
CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only"
CI_IMAGE_DOCKER_ARM64: v55533027-075ad767
CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only"
CI_IMAGE_GITLAB_AGENT_DEPLOY: v55533027-075ad767
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only"
CI_IMAGE_LINUX_GLIBC_2_17_X64: v55533027-075ad767
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only"
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55533027-075ad767
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only"
CI_IMAGE_SYSTEM_PROBE_X64: v55533027-075ad767
CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only"
CI_IMAGE_SYSTEM_PROBE_ARM64: v55533027-075ad767
CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only"
CI_IMAGE_RPM_X64: v55533027-075ad767
CI_IMAGE_RPM_X64_SUFFIX: "_test_only"
CI_IMAGE_RPM_ARM64: v55533027-075ad767
CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only"
CI_IMAGE_RPM_ARMHF: v55533027-075ad767
CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only"
CI_IMAGE_WIN_1809_X64: v55533027-075ad767
CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only"
CI_IMAGE_WIN_LTSC2022_X64: v55533027-075ad767
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only"

DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
DEB_GPG_KEY_ID: c0962c7d
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.5
1.23.6
2 changes: 1 addition & 1 deletion .wwhrd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ exceptions:

additional:
# list here paths to additional licenses
golang/go: "raw.githubusercontent.com/golang/go/go1.23.5/LICENSE"
golang/go: "raw.githubusercontent.com/golang/go/go1.23.6/LICENSE"
2 changes: 1 addition & 1 deletion devenv/scripts/Install-DevEnv.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
$ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue'

$go_version = "1.23.5"
$go_version = "1.23.6"
Write-Host -ForegroundColor Green "Installing go $go_version"

$gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip"
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/agent_dev_env.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,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.23.5` or
You must [install Golang](https://golang.org/doc/install) version `1.23.6` or
later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
cannot use any additional tool it might need.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/datadog-agent

go 1.23.3
go 1.23.0
CelianR marked this conversation as resolved.
Show resolved Hide resolved

// v0.8.0 was tagged long ago, and appared on pkg.go.dev. We do not want any tagged version
// to appear there. The trick to accomplish this is to make a new version (in this case v0.9.0)
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.23.3

toolchain go1.23.5
toolchain go1.23.6

use (
.
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
enhancements:
- |
Agents are now built with Go ``1.23.6``.
2 changes: 1 addition & 1 deletion tasks/go.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ def tidy(ctx):
@task
def check_go_version(ctx):
go_version_output = ctx.run('go version')
# result is like "go version go1.23.5 linux/amd64"
# result is like "go version go1.23.6 linux/amd64"
running_go_version = go_version_output.stdout.split(' ')[2]

with open(".go-version") as f:
Expand Down
2 changes: 1 addition & 1 deletion test/fakeintake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# syntax=docker/dockerfile:1

## Build
FROM golang:1.23.5-alpine3.20 AS build
FROM golang:1.23.6-alpine3.20 AS build

# need gcc to build with CGO_ENABLED=1
# need musl-dev to get stdlib.h
Expand Down
4 changes: 2 additions & 2 deletions test/new-e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/DataDog/datadog-agent/test/new-e2e

go 1.23.3
go 1.23.1
CelianR marked this conversation as resolved.
Show resolved Hide resolved

toolchain go1.23.5
toolchain go1.23.6

// Do not upgrade Pulumi plugins to versions different from `test-infra-definitions`.
// The plugin versions NEED to be aligned.
Expand Down
2 changes: 1 addition & 1 deletion tools/gdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.5.linux-amd64.tar.gz
RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.6.linux-amd64.tar.gz
RUN tar xzvf golang.tgz
RUN ln -s /go /goroot

Expand Down
Loading