[build] Upgrade all builds to use Golang 1.15 (#7884)

* [build] Upgrade all builds to use Golang 1.15 This change moves all our main build images to use Golang v1.15 and updates any relevant dev/user information required for this change. * Use more recent builders images Co-authored-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
DataDog · Apr 16, 2021 · 3a9f255 · 3a9f255
1 parent f3dc22d
commit 3a9f255
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -240,7 +240,7 @@ jobs:
     macos:
       xcode: 11.7.0
     environment:
-      BUILDIMAGES_VERSION: "aa0a9b99830e937e32986359794361aeb95940f5" # datadog-agent-buildimages commit to fetch to get the MacOS scripts
+      BUILDIMAGES_VERSION: "68f7e123fea89b2b9c06a5251b26249ee76e3877" # datadog-agent-buildimages commit to fetch to get the MacOS scripts
     working_directory: ~/go/src/github.com/DataDog/datadog-agent
     steps:
       - checkout

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -126,10 +126,10 @@ variables:
   S3_DSD6_URI: s3://dsd6-staging
   RELEASE_VERSION_6: nightly
   RELEASE_VERSION_7: nightly-a7
-  DATADOG_AGENT_BUILDIMAGES: v4275475-c9ec2fc
-  DATADOG_AGENT_BUILDERS: v4294510-7ad1af5
-  DATADOG_AGENT_WINBUILDIMAGES: v4309079-c71daf0
-  DATADOG_AGENT_ARMBUILDIMAGES: v4275475-c9ec2fc
+  DATADOG_AGENT_BUILDIMAGES: v4319944-68f7e12
+  DATADOG_AGENT_BUILDERS: v4329543-d98146e
+  DATADOG_AGENT_WINBUILDIMAGES: v4319944-68f7e12
+  DATADOG_AGENT_ARMBUILDIMAGES: v4319944-68f7e12
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v4319944-68f7e12
   BCC_VERSION: v0.19.0
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ and development, is located under [the docs directory](docs) of the present repo
 ## Getting started
 
 To build the Agent you need:
- * [Go](https://golang.org/doc/install) 1.13 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
+ * [Go](https://golang.org/doc/install) 1.15 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
  * Python 3.7+ along with development libraries for tooling. You will also need Python 2.7 if you are building the Agent with Python 2 support.
  * Python dependencies. You may install these with `pip install -r requirements.txt`
    This will also pull in [Invoke](http://www.pyinvoke.org) if not yet installed.

diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1
@@ -53,18 +53,18 @@ cinst -y cmake
 Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Golang'
 
 # TODO: Enable this when we can use Chocolatey again
-#cinst -y golang --version 1.14.12
+#cinst -y golang --version 1.15.11
 
-# Workaround for go 1.14.12 since it does not exist in Chocolatey
+# Workaround for go 1.15.11 since it does not exist in Chocolatey
 # taken from https://github.com/DataDog/datadog-agent-buildimages/blob/master/windows/install_go.ps1
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-Write-Host -ForegroundColor Green "Installing go 1.14.12"
+Write-Host -ForegroundColor Green "Installing go 1.15.11"
 
-$gozip = "https://dl.google.com/go/go1.14.12.windows-amd64.zip"
+$gozip = "https://dl.google.com/go/go1.15.11.windows-amd64.zip"
 if ($Env:TARGET_ARCH -eq "x86") {
-    $gozip = "https://dl.google.com/go/go1.14.12.windows-386.zip"
+    $gozip = "https://dl.google.com/go/go1.15.11.windows-386.zip"
 }
 
 $out = 'c:\go.zip'

diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md
@@ -93,7 +93,7 @@ variables (see Invoke docs for more details).
 
 ## Golang
 
-You must [install Golang](https://golang.org/doc/install) version `1.14`. Make
+You must [install Golang](https://golang.org/doc/install) version `1.15`. Make
 sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any
 additional tool it might need.
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent
 
-go 1.14
+go 1.15
 
 // Internal deps fix version
 replace (

diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/util/log
 
-go 1.14
+go 1.15
 
 require (
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575

diff --git a/pkg/util/winutil/go.mod b/pkg/util/winutil/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/util/winutil
 
-go 1.14
+go 1.15
 
 replace github.com/DataDog/datadog-agent/pkg/util/log => ../log
 

diff --git a/releasenotes/notes/bump-go-to-1.15.11-b2f7c7f546fcecb4.yaml b/releasenotes/notes/bump-go-to-1.15.11-b2f7c7f546fcecb4.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    The Agent, Logs Agent and the system-probe are now compiled with Go ``1.15.11``
diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod
@@ -5,6 +5,6 @@
 
 module github.com/DataDog/datadog-agent/tools/retry_file_dump
 
-go 1.14
+go 1.15
 
 require github.com/golang/protobuf v1.4.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,6 @@ @@
     module github.com/DataDog/datadog-agent/tools/retry_file_dump
-    go 1.14
+    go 1.15
     require github.com/golang/protobuf v1.4.3