From f4b795bbbb51405c53d10229919609c3f98e35c8 Mon Sep 17 00:00:00 2001
From: stevensbkang <skan070@gmail.com>
Date: Wed, 14 Aug 2024 21:30:36 +1200
Subject: [PATCH] refactor(k8s): remove repeats

---
 api/kubernetes/cli/namespace.go      | 15 ++++++++++-----
 api/kubernetes/cli/resource_quota.go |  6 +-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/api/kubernetes/cli/namespace.go b/api/kubernetes/cli/namespace.go
index e9f6888eb..f956c3721 100644
--- a/api/kubernetes/cli/namespace.go
+++ b/api/kubernetes/cli/namespace.go
@@ -63,11 +63,7 @@ func (kcl *KubeClient) fetchNamespacesForNonAdmin() (map[string]portainer.K8sNam
 		return nil, fmt.Errorf("an error occurred during the fetchNamespacesForNonAdmin operation, unable to list namespaces for the non-admin user: %w", err)
 	}
 
-	nonAdminNamespaceSet := make(map[string]struct{}, len(kcl.NonAdminNamespaces))
-	for _, ns := range kcl.NonAdminNamespaces {
-		nonAdminNamespaceSet[ns] = struct{}{}
-	}
-
+	nonAdminNamespaceSet := kcl.BuildNonAdminNamespacesMap()
 	results := make(map[string]portainer.K8sNamespaceInfo)
 	for _, namespace := range namespaces {
 		if _, exists := nonAdminNamespaceSet[namespace.Name]; exists {
@@ -286,3 +282,12 @@ func (kcl *KubeClient) CombineNamespaceWithResourceQuota(namespace portaineree.K
 
 	return response.JSON(w, namespace)
 }
+
+func (kcl *KubeClient) BuildNonAdminNamespacesMap() map[string]struct{} {
+	nonAdminNamespaceSet := make(map[string]struct{}, len(kcl.NonAdminNamespaces))
+	for _, namespace := range kcl.NonAdminNamespaces {
+		nonAdminNamespaceSet[namespace] = struct{}{}
+	}
+
+	return nonAdminNamespaceSet
+}
diff --git a/api/kubernetes/cli/resource_quota.go b/api/kubernetes/cli/resource_quota.go
index 4d87e2a0c..019f89b52 100644
--- a/api/kubernetes/cli/resource_quota.go
+++ b/api/kubernetes/cli/resource_quota.go
@@ -39,11 +39,7 @@ func (kcl *KubeClient) fetchResourceQuotasForNonAdmin(namespace string) (*[]core
 		return nil, err
 	}
 
-	nonAdminNamespaceSet := make(map[string]struct{}, len(kcl.NonAdminNamespaces))
-	for _, ns := range kcl.NonAdminNamespaces {
-		nonAdminNamespaceSet[ns] = struct{}{}
-	}
-
+	nonAdminNamespaceSet := kcl.BuildNonAdminNamespacesMap()
 	results := []corev1.ResourceQuota{}
 	for _, resourceQuota := range *resourceQuotas {
 		if _, exists := nonAdminNamespaceSet[resourceQuota.Namespace]; exists {