@@ -43,36 +43,32 @@ type Kubernetes struct {
4343}
4444
4545func NewKubernetes () (* Kubernetes , error ) {
46- cfg , err := resolveClientConfig ()
46+ k8s := & Kubernetes {}
47+ var err error
48+ k8s .cfg , err = resolveClientConfig ()
4749 if err != nil {
4850 return nil , err
4951 }
50- clientSet , err := kubernetes .NewForConfig (cfg )
52+ k8s .kubeConfigFiles = resolveConfig ().ConfigAccess ().GetLoadingPrecedence ()
53+ k8s .clientSet , err = kubernetes .NewForConfig (k8s .cfg )
5154 if err != nil {
5255 return nil , err
5356 }
54- discoveryClient , err : = discovery .NewDiscoveryClientForConfig (cfg )
57+ k8s . discoveryClient , err = discovery .NewDiscoveryClientForConfig (k8s . cfg )
5558 if err != nil {
5659 return nil , err
5760 }
58- dynamicClient , err := dynamic .NewForConfig (cfg )
61+ k8s .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (memory .NewMemCacheClient (k8s .discoveryClient ))
62+ k8s .dynamicClient , err = dynamic .NewForConfig (k8s .cfg )
5963 if err != nil {
6064 return nil , err
6165 }
62- scheme : = runtime .NewScheme ()
63- if err = v1 .AddToScheme (scheme ); err != nil {
66+ k8s . scheme = runtime .NewScheme ()
67+ if err = v1 .AddToScheme (k8s . scheme ); err != nil {
6468 return nil , err
6569 }
66- return & Kubernetes {
67- cfg : cfg ,
68- kubeConfigFiles : resolveConfig ().ConfigAccess ().GetLoadingPrecedence (),
69- scheme : scheme ,
70- parameterCodec : runtime .NewParameterCodec (scheme ),
71- clientSet : clientSet ,
72- discoveryClient : discoveryClient ,
73- deferredDiscoveryRESTMapper : restmapper .NewDeferredDiscoveryRESTMapper (memory .NewMemCacheClient (discoveryClient )),
74- dynamicClient : dynamicClient ,
75- }, nil
70+ k8s .parameterCodec = runtime .NewParameterCodec (k8s .scheme )
71+ return k8s , nil
7672}
7773
7874func (k * Kubernetes ) WatchKubeConfig (onKubeConfigChange func () error ) {
0 commit comments