From 47f6b614604ac12d4592bd86ec8bcd8a0f8ba516 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 09:50:15 +0000
Subject: [PATCH] chore(deps): update dependency golangci/golangci-lint to
 v1.58.2 (#280)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency golangci/golangci-lint to v1.58.2

* chore: fix linter issues after golangci-lint upgrade

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Patryk Małek <patryk.malek@konghq.com>
---
 .github/dependabot.yml         | 6 ------
 .golangci.yaml                 | 2 --
 .tools_versions.yaml           | 2 +-
 controller/pkg/secrets/cert.go | 2 +-
 modules/manager/webhook.go     | 6 +++---
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 464cca317..4ef541d90 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,12 +12,6 @@ updates:
     interval: daily
   labels:
   - dependencies
-- package-ecosystem: gomod
-  directory: /third_party/
-  schedule:
-    interval: daily
-  labels:
-  - dependencies
 - package-ecosystem: github-actions
   directory: /
   schedule:
diff --git a/.golangci.yaml b/.golangci.yaml
index 4b03a91ea..372ad596b 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -21,7 +21,6 @@ linters:
   - govet
   - importas
   - ineffassign
-  - megacheck
   - misspell
   - nilerr
   - nolintlint
@@ -118,7 +117,6 @@ issues:
   exclude-dirs:
     - pkg/clientset
     - config/
-    - third_party/
   include:
     - EXC0012
   exclude-rules:
diff --git a/.tools_versions.yaml b/.tools_versions.yaml
index a074fb83d..6b476e347 100644
--- a/.tools_versions.yaml
+++ b/.tools_versions.yaml
@@ -5,7 +5,7 @@ controller-tools: "0.15.0"
 # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
 kustomize: "5.4.1"
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-golangci-lint: "1.57.2"
+golangci-lint: "1.58.2"
 # renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
 skaffold: "2.11.1"
 # renovate: datasource=github-releases depName=go-delve/delve
diff --git a/controller/pkg/secrets/cert.go b/controller/pkg/secrets/cert.go
index 83dc7d7d9..d07dce875 100644
--- a/controller/pkg/secrets/cert.go
+++ b/controller/pkg/secrets/cert.go
@@ -421,7 +421,7 @@ func ensureContainerImageUpdated(container *corev1.Container, imageVersionStr st
 
 	// This is a special case for registries that specify a non default port,
 	// e.g. localhost:5000 or myregistry.io:8000. We do look for '/' since the
-	// contianer.Image will contain it as a separator between the registry+image
+	// container.Image will contain it as a separator between the registry+image
 	// and the version.
 	if len(imageParts) == 3 {
 		if !strings.Contains(container.Image, "/") {
diff --git a/modules/manager/webhook.go b/modules/manager/webhook.go
index fd52d5fc4..b0e6de9fe 100644
--- a/modules/manager/webhook.go
+++ b/modules/manager/webhook.go
@@ -130,19 +130,19 @@ func (m *webhookManager) Start(ctx context.Context) error {
 	// write the webhook certificate files on the filesystem
 	{
 		p := path.Join(m.cfg.WebhookCertDir, caCertFilename)
-		if err := os.WriteFile(p, certSecret.Data[consts.CAFieldSecret], os.ModePerm); err != nil {
+		if err := os.WriteFile(p, certSecret.Data[consts.CAFieldSecret], os.ModePerm); err != nil { //nolint:gosec
 			return fmt.Errorf("failed writing CA to %s: %w", p, err)
 		}
 	}
 	{
 		p := path.Join(m.cfg.WebhookCertDir, tlsCertFilename)
-		if err := os.WriteFile(p, certSecret.Data[consts.CertFieldSecret], os.ModePerm); err != nil {
+		if err := os.WriteFile(p, certSecret.Data[consts.CertFieldSecret], os.ModePerm); err != nil { //nolint:gosec
 			return fmt.Errorf("failed writing certificate to %s: %w", p, err)
 		}
 	}
 	{
 		p := path.Join(m.cfg.WebhookCertDir, tlsKeyFilename)
-		if err := os.WriteFile(p, certSecret.Data[consts.KeyFieldSecret], os.ModePerm); err != nil {
+		if err := os.WriteFile(p, certSecret.Data[consts.KeyFieldSecret], os.ModePerm); err != nil { //nolint:gosec
 			return fmt.Errorf("failed writing key to %s: %w", p, err)
 		}
 	}