diff --git a/.circleci/config.yml b/.circleci/config.yml index 87acf6075..06fe55976 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: command: V=1 CI=1 make vet - run: name: Install linters - command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s v1.17.1 && mv ./bin/* /go/bin/ + command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s v1.32.2 && mv ./bin/* /go/bin/ - run: name: Lint command: golangci-lint run ./... diff --git a/node/nodeutil/client.go b/node/nodeutil/client.go index 8f406b660..70d746dfe 100644 --- a/node/nodeutil/client.go +++ b/node/nodeutil/client.go @@ -24,13 +24,16 @@ func ClientsetFromEnv(kubeConfigPath string) (*kubernetes.Clientset, error) { ) if kubeConfigPath != "" { - if _, err := os.Stat(kubeConfigPath); err != nil { - config, err = rest.InClusterConfig() - } else { + _, err = os.Stat(kubeConfigPath) + if err == nil { config, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig( &clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfigPath}, &clientcmd.ConfigOverrides{}, ).ClientConfig() + } else if os.IsNotExist(err) { + config, err = rest.InClusterConfig() + } else { + return nil, err } } else { config, err = rest.InClusterConfig()