[7.17](backport #36846) [Automation] Bump Golang version to 1.20.10 (#…

…36859) * [Automation] Bump Golang version to 1.20.10 (#36846) --------- Co-authored-by: apmmachine <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]> (cherry picked from commit 6be0d18) # Conflicts: # .go-version # .golangci.yml # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/heartbeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # metricbeat/module/vsphere/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/functionbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile * Fix conflicts --------- Co-authored-by: apmmachine <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]>
elastic · Oct 24, 2023 · 2d93747 · 2d93747
1 parent 1a88a72
commit 2d93747
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 18 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.20.6
+1.20.10
diff --git a/.golangci.yml b/.golangci.yml
@@ -102,7 +102,7 @@ linters-settings:
 
  gosimple:
  # Select the Go version to target. The default is '1.13'.
- go: "1.20.6"
+ go: "1.20.10"
 
  nakedret:
  # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -120,19 +120,19 @@ linters-settings:
 
  staticcheck:
  # Select the Go version to target. The default is '1.13'.
- go: "1.20.6"
+ go: "1.20.10"
  checks: ["all"]
 
  stylecheck:
  # Select the Go version to target. The default is '1.13'.
- go: "1.20.6"
+ go: "1.20.10"
  # Disabled:
  # ST1005: error strings should not be capitalized
  checks: ["all", "-ST1005"]
 
  unused:
  # Select the Go version to target. The default is '1.13'.
- go: "1.20.6"
+ go: "1.20.10"
 
  gosec:
  excludes:

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -61,6 +61,7 @@ https:/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Affecting all Beats*
 
 
+- Upgrade to Go 1.20.10. {pull}36846[36846]
 
 *Auditbeat*
 

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 RUN \
  apt-get update \

diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.20.6 as builder
+FROM golang:1.20.10 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.20.6 as builder
+FROM golang:1.20.10 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.20.6 as builder
+FROM golang:1.20.10 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 

diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 RUN \
  apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.17.14
 :doc-branch: 7.17
-:go-version: 1.20.6
+:go-version: 1.20.10
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 RUN \
  apt update \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 COPY test/main.go main.go
 

diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile
@@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
 FROM nats:$NATS_VERSION
 
 # build stage
-FROM golang:1.20.6 AS build-env
+FROM golang:1.20.10 AS build-env
 RUN apt-get install git mercurial gcc
 RUN git clone https:/nats-io/nats.go.git /nats-go
 RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .

diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile
@@ -1,5 +1,5 @@
 ARG VSPHERE_GOLANG_VERSION
-FROM golang:${VSPHERE_GOLANG_VERSION}
+FROM golang:1.20.10
 
 RUN apt-get install curl git
 RUN go install github.com/vmware/govmomi/[email protected]

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 RUN \
  apt-get update \

diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6
+FROM golang:1.20.10
 
 RUN \
  apt-get update \

diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
-FROM golang:1.20.6 AS build-env
+FROM golang:1.20.10
 RUN apt-get install git mercurial gcc
 RUN git clone https:/nats-io/stan.go.git /stan-go
 RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .