@@ -43,36 +43,32 @@ type Kubernetes struct {
43
43
}
44
44
45
45
func NewKubernetes () (* Kubernetes , error ) {
46
- cfg , err := resolveClientConfig ()
46
+ k8s := & Kubernetes {}
47
+ var err error
48
+ k8s .cfg , err = resolveClientConfig ()
47
49
if err != nil {
48
50
return nil , err
49
51
}
50
- clientSet , err := kubernetes .NewForConfig (cfg )
52
+ k8s .kubeConfigFiles = resolveConfig ().ConfigAccess ().GetLoadingPrecedence ()
53
+ k8s .clientSet , err = kubernetes .NewForConfig (k8s .cfg )
51
54
if err != nil {
52
55
return nil , err
53
56
}
54
- discoveryClient , err : = discovery .NewDiscoveryClientForConfig (cfg )
57
+ k8s . discoveryClient , err = discovery .NewDiscoveryClientForConfig (k8s . cfg )
55
58
if err != nil {
56
59
return nil , err
57
60
}
58
- dynamicClient , err := dynamic .NewForConfig (cfg )
61
+ k8s .deferredDiscoveryRESTMapper = restmapper .NewDeferredDiscoveryRESTMapper (memory .NewMemCacheClient (k8s .discoveryClient ))
62
+ k8s .dynamicClient , err = dynamic .NewForConfig (k8s .cfg )
59
63
if err != nil {
60
64
return nil , err
61
65
}
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 {
64
68
return nil , err
65
69
}
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
76
72
}
77
73
78
74
func (k * Kubernetes ) WatchKubeConfig (onKubeConfigChange func () error ) {
0 commit comments