[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 <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]> (cherry picked from commit 05d4eaf) # 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
elastic · Oct 16, 2023 · 91eb2f7 · 91eb2f7
1 parent fda3726
commit 91eb2f7
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 1 deletion.
diff --git a/.go-version b/.go-version
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.20.8
+=======
+1.20.10
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
diff --git a/.golangci.yml b/.golangci.yml
@@ -116,7 +116,11 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.20.8"
+=======
+    go: "1.20.10"
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -136,17 +140,29 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.20.8"
+=======
+    go: "1.20.10"
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.20.8"
+=======
+    go: "1.20.10"
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.20.8"
+=======
+    go: "1.20.10"
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 
   gosec:
     excludes:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ARG GO_VERSION=1.20.8
+=======
+ARG GO_VERSION=1.20.10
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 FROM circleci/golang:${GO_VERSION}
 
 

diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ARG GO_VERSION=1.20.8
+=======
+ARG GO_VERSION=1.20.10
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 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
@@ -11,21 +11,29 @@
 kind: breaking-change
 
 # Change summary; a 80ish characters long description of the change.
+<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
 summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment and cronjob
+========
+summary: Upgrade to Go 1.20.10.
+>>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # 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: 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.
 # 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.
+<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
 pr: https://github.com/elastic/elastic-agent/pull/3591
+========
+pr: https://github.com/elastic/elastic-agent/pull/3601
+>>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
 
 # 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.

diff --git a/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
@@ -0,0 +1,40 @@
+# 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: breaking-change
+
+# Change summary; a 80ish characters long description of the change.
+<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
+summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment and cronjob
+========
+summary: Upgrade to Go 1.20.10.
+>>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
+
+# 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: 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"
+
+# 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.
+<<<<<<<< HEAD:changelog/fragments/1697102363-updating_agentautodiscovery_810.yaml
+pr: https://github.com/elastic/elastic-agent/pull/3591
+========
+pr: https://github.com/elastic/elastic-agent/pull/3601
+>>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601)):changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml
+
+# 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
@@ -3,7 +3,11 @@
 // 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
+<<<<<<< HEAD
 :go-version: 1.20.8
+=======
+:go-version: 1.20.10
+>>>>>>> 05d4eaff31 ([Automation] Bump Golang version to 1.20.10 (#3601))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12