Skip to content

Commit c3b1afe

Browse files
committed
Handle the cases where GVRFromType returns neither a GVR nor an error
1 parent 61134a0 commit c3b1afe

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

pkg/customresourcestate/config.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,12 @@ func FromConfig(decoder ConfigDecoder, discovererInstance *discovery.CRDiscovere
208208
if err != nil {
209209
return nil, fmt.Errorf("failed to create GVR for %s: %w", resource.GroupVersionKind, err)
210210
}
211-
gvrString := gvr.String()
211+
var gvrString string
212+
if gvr != nil {
213+
gvrString = gvr.String()
214+
} else {
215+
gvrString = factory.Name()
216+
}
212217
if _, ok := factoriesIndex[gvrString]; ok {
213218
klog.InfoS("reloaded factory", "GVR", gvrString)
214219
}

pkg/util/utils.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,13 @@ func CreateCustomResourceClients(apiserver string, kubeconfig string, factories
101101
if err != nil {
102102
return nil, err
103103
}
104-
customResourceClients[gvr.String()] = customResourceClient
104+
var gvrString string
105+
if gvr != nil {
106+
gvrString = gvr.String()
107+
} else {
108+
gvrString = f.Name()
109+
}
110+
customResourceClients[gvrString] = customResourceClient
105111
}
106112
return customResourceClients, nil
107113
}

0 commit comments

Comments
 (0)