From b72a0ba207075508e798787c6f540106e87c7fc5 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 16 Oct 2023 12:05:30 -0400 Subject: [PATCH] Fix remaining conflicts. --- .go-version | 4 ---- .golangci.yml | 16 ---------------- .../1697229987-Upgrade-to-Go-1.20.10.yaml | 4 ++-- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.go-version b/.go-version index d1b0249bf57..acdfc7930c8 100644 --- a/.go-version +++ b/.go-version @@ -1,5 +1 @@ -<<<<<<< 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 index 6a98b48646f..c72fb52ef8d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -116,11 +116,7 @@ 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 @@ -140,29 +136,17 @@ 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/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml index ffda84876ac..ee447999639 100644 --- a/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml +++ b/changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml @@ -8,7 +8,7 @@ # - 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 +kind: security # Change summary; a 80ish characters long description of the change. summary: Upgrade to Go 1.20.10. @@ -16,7 +16,7 @@ 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: 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. +# description: # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. component: "elastic-agent"