@@ -17,6 +17,7 @@ import (
17
17
"k8s.io/client-go/restmapper"
18
18
"k8s.io/client-go/tools/clientcmd"
19
19
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
20
+ "k8s.io/klog/v2"
20
21
"sigs.k8s.io/yaml"
21
22
)
22
23
@@ -58,11 +59,7 @@ func NewKubernetes(kubeconfig string) (*Kubernetes, error) {
58
59
if err != nil {
59
60
return nil , err
60
61
}
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 ()))
66
63
k8s .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (k8s .discoveryClient )
67
64
k8s .dynamicClient , err = dynamic .NewForConfig (k8s .cfg )
68
65
if err != nil {
@@ -132,6 +129,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
132
129
if ! ok {
133
130
return k
134
131
}
132
+ klog .V (5 ).Infof ("%s header found, using provided bearer token" , AuthorizationBearerTokenHeader )
135
133
derivedCfg := rest .CopyConfig (k .cfg )
136
134
derivedCfg .BearerToken = bearerToken
137
135
derivedCfg .BearerTokenFile = ""
@@ -157,11 +155,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
157
155
if err != nil {
158
156
return k
159
157
}
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 ()))
165
159
derived .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (derived .discoveryClient )
166
160
derived .dynamicClient , err = dynamic .NewForConfig (derived .cfg )
167
161
if err != nil {
0 commit comments