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

[Automation][7.17] Bump Golang version to 1.21.6 #37614

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c587265
chore: Update Metricbeat debug Dockerfile
apmmachine Dec 23, 2023
3932c45
chore: Update NATS module Dockerfile
apmmachine Dec 23, 2023
0f98b31
chore: Update Functionbeat Dockerfile
apmmachine Dec 23, 2023
5decafd
chore: Update HTTP module Dockerfile
apmmachine Dec 23, 2023
0a389eb
chore: Update .golangci.yml
apmmachine Dec 23, 2023
b66ba19
chore: Update Auditbeat Dockerfile
apmmachine Dec 23, 2023
6e5552d
chore: Update Heartbeat debug Dockerfile
apmmachine Dec 23, 2023
6938cc5
chore: Update libbeat Dockerfile
apmmachine Dec 23, 2023
eba7278
chore: Update Heartbeat Dockerfile
apmmachine Dec 23, 2023
4773d23
chore: Update .go-version
apmmachine Dec 23, 2023
876c3e9
chore: Update Filebeat debug Dockerfile
apmmachine Dec 23, 2023
70f5402
chore: Update Packetbeat Dockerfile
apmmachine Dec 23, 2023
c8264d3
chore: Update Metricbeat Dockerfile
apmmachine Dec 23, 2023
81651d6
chore: Update version.asciidoc
apmmachine Dec 23, 2023
6ab76f4
chore: Update Filebeat Dockerfile
apmmachine Dec 23, 2023
7ace1c6
chore: Update x-pack/libbeat Dockerfile
apmmachine Dec 23, 2023
0d7d3ed
chore: Update stan Dockerfile
apmmachine Dec 23, 2023
0a66294
chore: Update from vsphere Dockerfile
apmmachine Dec 23, 2023
f1a27e9
chore: Update .golangci.yml
apmmachine Jan 11, 2024
1b91c57
chore: Update Heartbeat Dockerfile
apmmachine Jan 11, 2024
b31384b
chore: Update Filebeat debug Dockerfile
apmmachine Jan 11, 2024
0f730ca
chore: Update NATS module Dockerfile
apmmachine Jan 11, 2024
2b20b67
chore: Update Heartbeat debug Dockerfile
apmmachine Jan 11, 2024
9d61778
chore: Update Packetbeat Dockerfile
apmmachine Jan 11, 2024
eaf1b6d
chore: Update Metricbeat debug Dockerfile
apmmachine Jan 11, 2024
795d24a
chore: Update from vsphere Dockerfile
apmmachine Jan 11, 2024
3a48dbc
chore: Update stan Dockerfile
apmmachine Jan 11, 2024
4b98055
chore: Update HTTP module Dockerfile
apmmachine Jan 11, 2024
0b8e27f
chore: Update Filebeat Dockerfile
apmmachine Jan 11, 2024
8d62f46
chore: Update Functionbeat Dockerfile
apmmachine Jan 11, 2024
339e5dc
chore: Update Auditbeat Dockerfile
apmmachine Jan 11, 2024
865294f
chore: Update Metricbeat Dockerfile
apmmachine Jan 11, 2024
abc02c0
chore: Update version.asciidoc
apmmachine Jan 11, 2024
2f78e26
chore: Update libbeat Dockerfile
apmmachine Jan 11, 2024
c5a8597
chore: Update .go-version
apmmachine Jan 11, 2024
240dc2d
chore: Update go.mod
apmmachine Jan 11, 2024
56a13dd
chore: Update x-pack/libbeat Dockerfile
apmmachine Jan 11, 2024
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 .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.12
1.21.6
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ linters-settings:

gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.20.12"
go: "1.21.6"

nakedret:
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
Expand All @@ -120,19 +120,19 @@ linters-settings:

staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20.12"
go: "1.21.6"
checks: ["all"]

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20.12"
go: "1.21.6"
# 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.12"
go: "1.21.6"

gosec:
excludes:
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12 as builder
FROM golang:1.21.6 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/heartbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12 as builder
FROM golang:1.21.6 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/metricbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12 as builder
FROM golang:1.21.6 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion filebeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
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/elastic/beats/v7

go 1.20
go 1.21

require (
cloud.google.com/go/bigquery v1.52.0
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:stack-version: 7.17.16
:doc-branch: 7.17
:go-version: 1.20.12
:go-version: 1.21.6
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt update \
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

COPY test/main.go main.go

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nats/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
FROM nats:$NATS_VERSION

# build stage
FROM golang:1.20.12 AS build-env
FROM golang:1.21.6 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/nats.go.git /nats-go
RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/vsphere/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VSPHERE_GOLANG_VERSION
FROM golang:1.20.12
FROM golang:1.21.6

RUN apt-get install curl git
RUN go install github.com/vmware/govmomi/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/libbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.12
FROM golang:1.21.6

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/stan/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
FROM nats-streaming:$STAN_VERSION

# build stage
FROM golang:1.20.12 AS build-env
FROM golang:1.21.6 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/stan.go.git /stan-go
RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .
Expand Down
Loading