From 5baa584c39069f276b1d69567cf17afb7bcbdb61 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:39:01 -0400 Subject: [PATCH] [8.10](backport #3601) [Automation] Bump Golang version to 1.20.10 (#3610) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Automation] Bump Golang version to 1.20.10 (#3601) * chore: Update from dockerfiles Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * Add Go 1.20.10 changelog fragment. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie (cherry picked from commit 05d4eaff31eeee8d92c3c6d0055d3c79112bfec9) # Conflicts: # .go-version # .golangci.yml # Dockerfile # Dockerfile.skaffold # changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml # changelog/fragments/1697111928-upgrade-to-go-1.20.9.yaml # changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml # version/docs/version.asciidoc * Resolve conflicts. * Fix remaining conflicts. --------- Co-authored-by: apmmachine <58790750+apmmachine@users.noreply.github.com> Co-authored-by: Craig MacKenzie --- .go-version | 2 +- .golangci.yml | 8 ++--- Dockerfile | 2 +- Dockerfile.skaffold | 2 +- ...02363-updating_agentautodiscovery_810.yaml | 2 +- .../1697229987-Upgrade-to-Go-1.20.10.yaml | 32 +++++++++++++++++++ version/docs/version.asciidoc | 2 +- 7 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml diff --git a/.go-version b/.go-version index 95393fc7d4d..acdfc7930c8 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.8 +1.20.10 diff --git a/.golangci.yml b/.golangci.yml index a6f9f5de236..c72fb52ef8d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -116,7 +116,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.20.8" + 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 @@ -136,17 +136,17 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.8" + go: "1.20.10" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.8" + go: "1.20.10" checks: ["all"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.20.8" + go: "1.20.10" gosec: excludes: diff --git a/Dockerfile b/Dockerfile index d0c2edc9f94..f3d3475041b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.20.8 +ARG GO_VERSION=1.20.10 FROM circleci/golang:${GO_VERSION} diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold index ca9300eb4de..4122e146bf6 100644 --- a/Dockerfile.skaffold +++ b/Dockerfile.skaffold @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.20.8 +ARG GO_VERSION=1.20.10 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild" ARG AGENT_VERSION=8.9.0-SNAPSHOT ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent" diff --git a/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml b/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml index bdfb0a804ee..1d9551796b6 100644 --- a/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml +++ b/changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml @@ -19,7 +19,7 @@ summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment description: Elastic-agent-autodiscover library by default comes with add_resource_metadata.deployment=false and add_resource_metadata.cronjob=false. Pods that will be created from deployments or cronjobs will not have the extra metadata field for kubernetes.deployment or kubernetes.cronjob respectively. # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. -component: elastic-agent +component: "elastic-agent" # PR URL; optional; the PR number that added the changeset. # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. diff --git a/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml new file mode 100644 index 00000000000..ee447999639 --- /dev/null +++ b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: security + +# Change summary; a 80ish characters long description of the change. +summary: Upgrade to Go 1.20.10. + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +# description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: "elastic-agent" + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/elastic-agent/pull/3601 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 diff --git a/version/docs/version.asciidoc b/version/docs/version.asciidoc index 4c1d479ebc7..f12a0dbf1a1 100644 --- a/version/docs/version.asciidoc +++ b/version/docs/version.asciidoc @@ -3,7 +3,7 @@ // FIXME: once elastic.co docs have been switched over to use `main`, remove // the `doc-site-branch` line below as well as any references to it in the code. :doc-site-branch: master -:go-version: 1.20.8 +:go-version: 1.20.10 :release-state: unreleased :python: 3.7 :docker: 1.12