refactor(k8s): remove repeats

pull/12062/head
stevensbkang 2024-08-14 21:30:36 +12:00
parent 2d85961695
commit f4b795bbbb
No known key found for this signature in database
2 changed files with 11 additions and 10 deletions

View File

@ -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
}

View File

@ -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 {