From b4e62a645b9209a05ae4a15d366cd14f03484624 Mon Sep 17 00:00:00 2001
From: Sargun Dhillon <sargun@sargun.me>
Date: Fri, 6 Nov 2020 17:08:38 -0800
Subject: [PATCH 1/3] Revert "Upgrade to golangci-lint v1.32.2"

---
 .circleci/config.yml    | 2 +-
 node/nodeutil/client.go | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06fe55976..87acf6075 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.32.2 && mv ./bin/* /go/bin/
+          command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s v1.17.1 && mv ./bin/* /go/bin/
       - run:
           name: Lint
           command: golangci-lint run ./...
diff --git a/node/nodeutil/client.go b/node/nodeutil/client.go
index 70d746dfe..8f406b660 100644
--- a/node/nodeutil/client.go
+++ b/node/nodeutil/client.go
@@ -24,16 +24,13 @@ func ClientsetFromEnv(kubeConfigPath string) (*kubernetes.Clientset, error) {
 	)
 
 	if kubeConfigPath != "" {
-		_, err = os.Stat(kubeConfigPath)
-		if err == nil {
+		if _, err := os.Stat(kubeConfigPath); err != nil {
+			config, err = rest.InClusterConfig()
+		} else {
 			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()

From 544cca975f3b76b5cdb1565eb8910bfa0d9bd73c Mon Sep 17 00:00:00 2001
From: Sargun Dhillon <sargun@sargun.me>
Date: Fri, 6 Nov 2020 17:05:30 -0800
Subject: [PATCH 2/3] Fix error handling behaviour in nodeutil

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(
			        ^
---
 node/nodeutil/client.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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()

From 5f63e9d30a963e4a81d839c0386612c5f01f786a Mon Sep 17 00:00:00 2001
From: Sargun Dhillon <sargun@sargun.me>
Date: Fri, 6 Nov 2020 17:06:55 -0800
Subject: [PATCH 3/3] Upgrade to golangci-lint v1.32.2

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ./...