d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix error handling behaviour in nodeutil

Browse Source 
Golang Lint v1.32.2 detects this case:
node/nodeutil/client.go:28:12: ineffectual assignment to `err` (ineffassign)
			config, err = rest.InClusterConfig()
			        ^
node/nodeutil/client.go:30:12: ineffectual assignment to `err` (ineffassign)
			config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
			        ^
This commit is contained in:
Sargun Dhillon
2020-11-06 17:05:30 -08:00
parent b4e62a645b
commit 544cca975f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
node/nodeutil/client.go
View File

@@ -24,13 +24,16 @@ func ClientsetFromEnv(kubeConfigPath string) (*kubernetes.Clientset, error) {
) )
if kubeConfigPath != "" { if kubeConfigPath != "" {
if _, err := os.Stat(kubeConfigPath); err != nil { _, err = os.Stat(kubeConfigPath)
config, err = rest.InClusterConfig() if err == nil {
} else {
config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig( config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfigPath}, &clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfigPath},
&clientcmd.ConfigOverrides{}, &clientcmd.ConfigOverrides{},
).ClientConfig() ).ClientConfig()
} else if os.IsNotExist(err) {
config, err = rest.InClusterConfig()
} else {
return nil, err
} }
} else { } else {
config, err = rest.InClusterConfig() config, err = rest.InClusterConfig()