From a51d12056fd7bd17c0c3e2ddd4ef32fa5070fdba Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Tue, 7 Jun 2022 20:41:35 -0700
Subject: [PATCH] Tweaks based on review comments

Signed-off-by: Michael Kelly <mkelly@arista.com>
---
 storage/kubernetes/client.go  | 16 ++++++++--------
 storage/kubernetes/storage.go |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go
index f46a639c..15a391a4 100644
--- a/storage/kubernetes/client.go
+++ b/storage/kubernetes/client.go
@@ -96,18 +96,18 @@ func (cli *client) urlForWithParams(
 	} else {
 		p = path.Join(basePath, apiVersion, resource, name)
 	}
-	if strings.HasSuffix(cli.baseURL, "/") {
-		return cli.baseURL + p
-	}
-
-	r := cli.baseURL + "/" + p
 
 	encodedParams := params.Encode()
+	paramsSuffix := ""
 	if len(encodedParams) > 0 {
-		return r + "?" + encodedParams
+		paramsSuffix = "?" + encodedParams
 	}
 
-	return r
+	if strings.HasSuffix(cli.baseURL, "/") {
+		return cli.baseURL + p + paramsSuffix
+	}
+
+	return cli.baseURL + "/" + p + paramsSuffix
 }
 
 func (cli *client) urlFor(apiVersion, namespace, resource, name string) string {
@@ -201,7 +201,7 @@ func (cli *client) listN(resource string, v interface{}, n int) error {
 }
 
 func (cli *client) list(resource string, v interface{}) error {
-	return cli.listN(resource, v, -1)
+	return cli.get(resource, "", v)
 }
 
 func (cli *client) post(resource string, v interface{}) error {
diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go
index c25d7550..033d3e23 100644
--- a/storage/kubernetes/storage.go
+++ b/storage/kubernetes/storage.go
@@ -41,7 +41,7 @@ const (
 )
 
 const (
-	gcResultLimit = 10000
+	gcResultLimit = 500
 )
 
 // Config values for the Kubernetes storage type.