@@ -17,6 +17,7 @@ import (
1717 "k8s.io/client-go/restmapper"
1818 "k8s.io/client-go/tools/clientcmd"
1919 clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
20+ "k8s.io/klog/v2"
2021 "sigs.k8s.io/yaml"
2122)
2223
@@ -58,11 +59,7 @@ func NewKubernetes(kubeconfig string) (*Kubernetes, error) {
5859 if err != nil {
5960 return nil , err
6061 }
61- discoveryClient , err := discovery .NewDiscoveryClientForConfig (k8s .cfg )
62- if err != nil {
63- return nil , err
64- }
65- k8s .discoveryClient = memory .NewMemCacheClient (discoveryClient )
62+ k8s .discoveryClient = memory .NewMemCacheClient (discovery .NewDiscoveryClient (k8s .clientSet .CoreV1 ().RESTClient ()))
6663 k8s .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (k8s .discoveryClient )
6764 k8s .dynamicClient , err = dynamic .NewForConfig (k8s .cfg )
6865 if err != nil {
@@ -132,6 +129,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
132129 if ! ok {
133130 return k
134131 }
132+ klog .V (5 ).Infof ("%s header found, using provided bearer token" , AuthorizationBearerTokenHeader )
135133 derivedCfg := rest .CopyConfig (k .cfg )
136134 derivedCfg .BearerToken = bearerToken
137135 derivedCfg .BearerTokenFile = ""
@@ -157,11 +155,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
157155 if err != nil {
158156 return k
159157 }
160- discoveryClient , err := discovery .NewDiscoveryClientForConfig (derived .cfg )
161- if err != nil {
162- return k
163- }
164- derived .discoveryClient = memory .NewMemCacheClient (discoveryClient )
158+ derived .discoveryClient = memory .NewMemCacheClient (discovery .NewDiscoveryClient (derived .clientSet .CoreV1 ().RESTClient ()))
165159 derived .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (derived .discoveryClient )
166160 derived .dynamicClient , err = dynamic .NewForConfig (derived .cfg )
167161 if err != nil {
0 commit comments