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.11 #39832

Merged
merged 60 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e17e106
chore: Update from vsphere Dockerfile
github-actions[bot] Jun 7, 2024
ef81548
chore: Update Metricbeat debug Dockerfile
github-actions[bot] Jun 7, 2024
936d30c
chore: Update Packetbeat Dockerfile
github-actions[bot] Jun 7, 2024
b455882
chore: Update x-pack/libbeat Dockerfile
github-actions[bot] Jun 7, 2024
8d9527f
chore: Update Heartbeat debug Dockerfile
github-actions[bot] Jun 7, 2024
7162bfa
chore: Update .go-version
github-actions[bot] Jun 7, 2024
21f645c
chore: Update .golangci.yml
github-actions[bot] Jun 7, 2024
05d44c1
chore: Update version.asciidoc
github-actions[bot] Jun 7, 2024
4d7327a
chore: Update libbeat Dockerfile
github-actions[bot] Jun 7, 2024
4fdc445
chore: Update Filebeat debug Dockerfile
github-actions[bot] Jun 7, 2024
7ce9e5a
chore: Update Auditbeat Dockerfile
github-actions[bot] Jun 7, 2024
10eaa31
chore: Update Heartbeat Dockerfile
github-actions[bot] Jun 7, 2024
c11cbfb
chore: Update Functionbeat Dockerfile
github-actions[bot] Jun 7, 2024
afce91f
chore: Update stan Dockerfile
github-actions[bot] Jun 7, 2024
05336a3
chore: Update NATS module Dockerfile
github-actions[bot] Jun 7, 2024
badd1db
chore: Update Metricbeat Dockerfile
github-actions[bot] Jun 7, 2024
9a14f7a
chore: Update Filebeat Dockerfile
github-actions[bot] Jun 7, 2024
bf5519d
chore: Update HTTP module Dockerfile
github-actions[bot] Jun 7, 2024
4c1eab5
Add changelog.
cmacknz Jun 7, 2024
3e5831c
chore: Update libbeat Dockerfile
github-actions[bot] Jun 10, 2024
092bd88
chore: Update Auditbeat Dockerfile
github-actions[bot] Jun 10, 2024
d7b41c1
chore: Update Functionbeat Dockerfile
github-actions[bot] Jun 10, 2024
ad76416
chore: Update .go-version
github-actions[bot] Jun 10, 2024
80d5417
chore: Update Heartbeat debug Dockerfile
github-actions[bot] Jun 10, 2024
96529be
chore: Update Metricbeat Dockerfile
github-actions[bot] Jun 10, 2024
593cc1e
chore: Update NATS module Dockerfile
github-actions[bot] Jun 10, 2024
dad73c0
chore: Update x-pack/libbeat Dockerfile
github-actions[bot] Jun 10, 2024
4912144
chore: Update stan Dockerfile
github-actions[bot] Jun 10, 2024
c674100
chore: Update Heartbeat Dockerfile
github-actions[bot] Jun 10, 2024
84c67c0
chore: Update HTTP module Dockerfile
github-actions[bot] Jun 10, 2024
7d80d58
chore: Update Filebeat Dockerfile
github-actions[bot] Jun 10, 2024
43e8cdb
chore: Update Packetbeat Dockerfile
github-actions[bot] Jun 10, 2024
c1dde95
chore: Update from vsphere Dockerfile
github-actions[bot] Jun 10, 2024
03381a1
chore: Update version.asciidoc
github-actions[bot] Jun 10, 2024
a9814b4
chore: Update Metricbeat debug Dockerfile
github-actions[bot] Jun 10, 2024
681a98d
chore: Update Filebeat debug Dockerfile
github-actions[bot] Jun 10, 2024
6eaa798
chore: Update .golangci.yml
github-actions[bot] Jun 10, 2024
9e2d702
Merge branch '7.17' into updatecli_7.17_bump-golang-version-7.17
cmacknz Jun 10, 2024
c181d1c
chore: Update .golangci.yml
github-actions[bot] Jun 11, 2024
0198720
chore: Update Functionbeat Dockerfile
github-actions[bot] Jun 11, 2024
d9aee4e
chore: Update Auditbeat Dockerfile
github-actions[bot] Jun 11, 2024
cc73a23
chore: Update NATS module Dockerfile
github-actions[bot] Jun 11, 2024
8ce6e70
chore: Update x-pack/libbeat Dockerfile
github-actions[bot] Jun 11, 2024
f58702a
chore: Update Metricbeat Dockerfile
github-actions[bot] Jun 11, 2024
0ad4b33
chore: Update Metricbeat debug Dockerfile
github-actions[bot] Jun 11, 2024
bc6b7a6
chore: Update version.asciidoc
github-actions[bot] Jun 11, 2024
c1c1787
chore: Update from vsphere Dockerfile
github-actions[bot] Jun 11, 2024
7bf083a
chore: Update libbeat Dockerfile
github-actions[bot] Jun 11, 2024
ea6efc7
chore: Update Filebeat Dockerfile
github-actions[bot] Jun 11, 2024
ab9ca62
chore: Update Filebeat debug Dockerfile
github-actions[bot] Jun 11, 2024
6532d82
chore: Update Heartbeat debug Dockerfile
github-actions[bot] Jun 11, 2024
4d041d9
chore: Update .go-version
github-actions[bot] Jun 11, 2024
e8112df
chore: Update HTTP module Dockerfile
github-actions[bot] Jun 11, 2024
4d5e2ff
chore: Update stan Dockerfile
github-actions[bot] Jun 11, 2024
3020242
chore: Update Heartbeat Dockerfile
github-actions[bot] Jun 11, 2024
58aeaf6
chore: Update Packetbeat Dockerfile
github-actions[bot] Jun 11, 2024
3a4cc2b
Merge branch '7.17' into updatecli_7.17_bump-golang-version-7.17
cmacknz Jun 12, 2024
9479be2
Merge branch '7.17' into updatecli_7.17_bump-golang-version-7.17
cmacknz Jun 17, 2024
5c7d743
Merge branch '7.17' into updatecli_7.17_bump-golang-version-7.17
cmacknz Jun 17, 2024
e96e89a
Use same changeset exclusions as main.
cmacknz Jun 17, 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.21.10
1.21.11
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.21.10"
go: "1.21.11"

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.21.10"
go: "1.21.11"
checks: ["all"]

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

gosec:
excludes:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Affecting all Beats*

- Upgrade to Go 1.21.10. {pull}39468[39468]
- Upgrade to Go 1.21.11. {pull}39832[39832]

*Auditbeat*

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.21.10
FROM golang:1.21.11

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.21.10 as builder
FROM golang:1.21.11 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.21.10 as builder
FROM golang:1.21.11 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.21.10 as builder
FROM golang:1.21.11 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.21.10
FROM golang:1.21.11

RUN \
apt-get update \
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.21.10
FROM golang:1.21.11

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.21.10
FROM golang:1.21.11

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.21
:doc-branch: 7.17
:go-version: 1.21.10
:go-version: 1.21.11
: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.21.10
FROM golang:1.21.11
COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/

RUN \
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.21.10
FROM golang:1.21.11

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.21.10 AS build-env
FROM golang:1.21.11 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.21.10
FROM golang:1.21.11

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.21.10
FROM golang:1.21.11

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.21.10
FROM golang:1.21.11

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.21.10
FROM golang:1.21.11

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.21.10 AS build-env
FROM golang:1.21.11 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