mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-18 22:14:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1457 from skriss/shortcuts-perf-issue

Browse Source 
shortcut expander: use discovery helper's cached resource list
This commit is contained in:
Nolan Brubaker
2019-05-07 15:57:12 -04:00
committed by GitHub
parent e5e3bc6b89 90c89f764e
commit 05b8edf894
2 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/discovery/helper.go
+7 -7
View File
@@ -1,5 +1,5 @@
/*
Copyright 2017 the Velero contributors.
Copyright 2017, 2019 the Velero contributors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -105,12 +105,6 @@ func (h *helper) Refresh() error {
if err != nil {
return errors.WithStack(err)
}
mapper := restmapper.NewDiscoveryRESTMapper(groupResources)
shortcutExpander, err := kcmdutil.NewShortcutExpander(mapper, h.discoveryClient, h.logger)
if err != nil {
return errors.WithStack(err)
}
h.mapper = shortcutExpander
preferredResources, err := refreshServerPreferredResources(h.discoveryClient, h.logger)
if err != nil {
@@ -124,6 +118,12 @@ func (h *helper) Refresh() error {
sortResources(h.resources)
shortcutExpander, err := kcmdutil.NewShortcutExpander(restmapper.NewDiscoveryRESTMapper(groupResources), h.resources, h.logger)
if err != nil {
return errors.WithStack(err)
}
h.mapper = shortcutExpander
h.resourcesMap = make(map[schema.GroupVersionResource]metav1.APIResource)
for _, resourceGroup := range h.resources {
gv, err := schema.ParseGroupVersion(resourceGroup.GroupVersion)