From 1a4896f46594a065b2b4cbcc4ccb6f0a6a806476 Mon Sep 17 00:00:00 2001
From: Aaron U'Ren <aauren@gmail.com>
Date: Sat, 7 Oct 2023 13:54:38 -0500
Subject: [PATCH] feat(lint): upgrade golangci-lint v1.50.1 -> v1.54.2

---
 .golangci.yml                    | 1 -
 Makefile                         | 2 +-
 pkg/controllers/routing/utils.go | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index dd113aa89..9972a903e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,7 +3,6 @@ run:
 linters:
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - durationcheck
diff --git a/Makefile b/Makefile
index 72473e3ae..ceb5ab29c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ GO_CACHE?=$(shell go env GOCACHE)
 GO_MOD_CACHE?=$(shell go env GOMODCACHE)
 BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
 RUNTIME_BASE?=alpine:3.18
-DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.50.1
+DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.54.2
 GOBGP_VERSION=v3.17.0
 QEMU_IMAGE?=multiarch/qemu-user-static
 GORELEASER_VERSION=v1.14.1
diff --git a/pkg/controllers/routing/utils.go b/pkg/controllers/routing/utils.go
index 57a346cb7..9927f6b13 100644
--- a/pkg/controllers/routing/utils.go
+++ b/pkg/controllers/routing/utils.go
@@ -267,7 +267,7 @@ func getPodCIDRsFromAllNodeSources(node *v1core.Node) (podCIDRs []string) {
 			klog.Warningf("couldn't parse CIDR %s from kube-router.io/pod-cidr annotation, skipping...", podCIDR)
 		} else {
 			podCIDRs = append(podCIDRs, podCIDR)
-			return
+			return podCIDRs
 		}
 	}
 
@@ -286,7 +286,7 @@ func getPodCIDRsFromAllNodeSources(node *v1core.Node) (podCIDRs []string) {
 			}
 			podCIDRs = append(podCIDRs, cidr)
 		}
-		return
+		return podCIDRs
 	}
 
 	// Finally, if all else fails, use the PodCIDRs on the node spec