Skip to content

feat(auth): minor optimization + logging #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

feat(auth): minor optimization + logging #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions pkg/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"k8s.io/client-go/restmapper"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/klog/v2"
"sigs.k8s.io/yaml"
)

Expand Down Expand Up @@ -58,11 +59,7 @@ func NewKubernetes(kubeconfig string) (*Kubernetes, error) {
if err != nil {
return nil, err
}
discoveryClient, err := discovery.NewDiscoveryClientForConfig(k8s.cfg)
if err != nil {
return nil, err
}
k8s.discoveryClient = memory.NewMemCacheClient(discoveryClient)
k8s.discoveryClient = memory.NewMemCacheClient(discovery.NewDiscoveryClient(k8s.clientSet.CoreV1().RESTClient()))
k8s.deferredDiscoveryRESTMapper = restmapper.NewDeferredDiscoveryRESTMapper(k8s.discoveryClient)
k8s.dynamicClient, err = dynamic.NewForConfig(k8s.cfg)
if err != nil {
Expand Down Expand Up @@ -132,6 +129,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
if !ok {
return k
}
klog.V(5).Infof("%s header found, using provided bearer token", AuthorizationBearerTokenHeader)
derivedCfg := rest.CopyConfig(k.cfg)
derivedCfg.BearerToken = bearerToken
derivedCfg.BearerTokenFile = ""
Expand All @@ -157,11 +155,7 @@ func (k *Kubernetes) Derived(ctx context.Context) *Kubernetes {
if err != nil {
return k
}
discoveryClient, err := discovery.NewDiscoveryClientForConfig(derived.cfg)
if err != nil {
return k
}
derived.discoveryClient = memory.NewMemCacheClient(discoveryClient)
derived.discoveryClient = memory.NewMemCacheClient(discovery.NewDiscoveryClient(derived.clientSet.CoreV1().RESTClient()))
derived.deferredDiscoveryRESTMapper = restmapper.NewDeferredDiscoveryRESTMapper(derived.discoveryClient)
derived.dynamicClient, err = dynamic.NewForConfig(derived.cfg)
if err != nil {
Expand Down
Loading