From 0516acf6cf74f142006264116ad8426894750cfd Mon Sep 17 00:00:00 2001
From: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
Date: Wed, 9 Aug 2023 12:55:10 +1000
Subject: [PATCH] Update linter and fix warnings

---
 .golangci.yml                | 7 ++++---
 Makefile                     | 2 +-
 pkg/kstatus/.golangci.yml    | 4 ++--
 pkg/manifestreader/common.go | 7 +++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 398a44a9..435321ae 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 run:
-  deadline: 5m
+  deadline: 30m
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
@@ -10,7 +10,7 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
+    # - depguard
     - dogsled
     - dupl
     - errcheck
@@ -53,4 +53,5 @@ issues:
   # it can be disabled by `exclude-use-default: false`. To list all
   # excluded by default patterns execute `golangci-lint run --help`
   exclude:
-    - Using the variable on range scope `tc` in function literal
\ No newline at end of file
+    - "Using the variable on range scope `tc` in function literal"
+    - "unused-parameter: parameter"
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 755f5625..75b466c6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ all: generate license fix vet fmt test lint tidy
 	go install github.com/google/addlicense@v1.0.0
 
 "$(MYGOBIN)/golangci-lint":
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.0
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
 
 "$(MYGOBIN)/deepcopy-gen":
 	go install k8s.io/code-generator/cmd/deepcopy-gen@v0.25.2
diff --git a/pkg/kstatus/.golangci.yml b/pkg/kstatus/.golangci.yml
index 0f4759a8..6bbfd890 100644
--- a/pkg/kstatus/.golangci.yml
+++ b/pkg/kstatus/.golangci.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 run:
-  deadline: 5m
+  deadline: 30m
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
@@ -11,7 +11,7 @@ linters:
   enable:
   - bodyclose
   - deadcode
-  - depguard
+  # - depguard
   - dogsled
   - dupl
   - errcheck
diff --git a/pkg/manifestreader/common.go b/pkg/manifestreader/common.go
index 35cd831c..2f2326e9 100644
--- a/pkg/manifestreader/common.go
+++ b/pkg/manifestreader/common.go
@@ -81,11 +81,10 @@ func SetNamespaces(mapper meta.RESTMapper, objs []*unstructured.Unstructured,
 				// of unknown types.
 				unknownGVKs = append(unknownGVKs, unknownTypeError.GroupVersionKind)
 				continue
-			} else {
-				// If something went wrong when looking up the scope, just
-				// give up.
-				return err
 			}
+			// If something went wrong when looking up the scope, just
+			// give up.
+			return err
 		}
 
 		switch scope {