github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

wrap extractor errors

Browse Source
This commit is contained in:
Kevin Delgado 2021-07-27 01:25:03 +00:00
parent 7bfc420351
commit 479e2ae307
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/client-go/applyconfigurations/meta/v1/unstructured.go
View File

@ -1,6 +1,7 @@
package v1 package v1
import ( import (
"fmt"
"sync" "sync"
"time" "time"
@ -59,7 +60,7 @@ func (c *gvkParserCache) objectTypeForGVK(gvk schema.GroupVersionKind) (*typed.P
defer c.mu.Unlock() defer c.mu.Unlock()
// if the ttl on the openAPISchema has expired, // if the ttl on the openAPISchema has expired,
// regenerate the gvk parser // regenerate the gvk parser
if time.Now().After(c.lastChecked.Add(openAPISchemaTTL)) { if time.Since(c.lastChecked) > openAPISchemaTTL {
c.lastChecked = time.Now() c.lastChecked = time.Now()
parser, err := regenerateGVKParser(c.discoveryClient) parser, err := regenerateGVKParser(c.discoveryClient)
if err != nil { if err != nil {
@ -77,11 +78,9 @@ type extractor struct {
// NewUnstructuredExtractor creates the extractor with which you can extract the applied configuration // NewUnstructuredExtractor creates the extractor with which you can extract the applied configuration
// for a given manager from an unstructured object. // for a given manager from an unstructured object.
func NewUnstructuredExtractor(dc discovery.DiscoveryInterface) (UnstructuredExtractor, error) { func NewUnstructuredExtractor(dc discovery.DiscoveryInterface) (UnstructuredExtractor, error) {
// TODO: expose ttl as an argument if we want to.
parser, err := regenerateGVKParser(dc) parser, err := regenerateGVKParser(dc)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed generating initial GVK Parser: %v", err)
} }
return &extractor{ return &extractor{
cache: &gvkParserCache{ cache: &gvkParserCache{
@ -108,12 +107,12 @@ func (e *extractor) extractUnstructured(object *unstructured.Unstructured, field
gvk := object.GetObjectKind().GroupVersionKind() gvk := object.GetObjectKind().GroupVersionKind()
objectType, err := e.cache.objectTypeForGVK(gvk) objectType, err := e.cache.objectTypeForGVK(gvk)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to fetch the objectType: %v", err)
} }
result := &unstructured.Unstructured{} result := &unstructured.Unstructured{}
err = managedfields.ExtractInto(object, *objectType, fieldManager, result, subresource) err = managedfields.ExtractInto(object, *objectType, fieldManager, result, subresource)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed calling ExtractInto for unstructured: %v", err)
} }
result.SetName(object.GetName()) result.SetName(object.GetName())
result.SetNamespace(object.GetNamespace()) result.SetNamespace(object.GetNamespace())