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

fix(go): Update to go 1.21.11 #32408

Merged
merged 3 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
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:v49173584-da48ad73
- image: gcr.io/datadoghq/agent-circleci-runner_test_only:v51588231-cc59f87a
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
28 changes: 14 additions & 14 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,20 @@ 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: v49173584-da48ad73
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_WINBUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_ARMBUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_NIKOS_BUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v49173584-da48ad73
DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_BUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_WINBUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_ARMBUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_NIKOS_BUILDIMAGES: v51588231-cc59f87a
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v51588231-cc59f87a
# 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: ""
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.9
1.21.11
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.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"
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 @@ -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.

Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/bump-go-to-1.21.11-90571ee14ed4f7dd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
enhancements:
- |
Agents are now built with Go ``1.21.11``.
2 changes: 1 addition & 1 deletion tasks/go.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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.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
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.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

Expand Down
Loading