From defcbe8151fb47382956fca0cd3b5ba84d3eb5e2 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Fri, 20 Dec 2019 16:18:09 +0200
Subject: [PATCH] protokube/pkg - fix static check

---
 hack/.staticcheck_failures              |  3 --
 protokube/pkg/gossip/dns/hosts/hosts.go | 48 -------------------------
 protokube/pkg/gossip/mesh/gossip.go     |  2 +-
 protokube/pkg/gossip/mesh/mesh.pb.go    |  2 ++
 protokube/pkg/protokube/etcd_cluster.go |  8 ++---
 5 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index e2fdcd34a3..1f45ea6711 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -17,9 +17,6 @@ pkg/resources/digitalocean/dns
 pkg/resources/gce
 pkg/resources/openstack
 pkg/sshcredentials
-protokube/pkg/gossip/dns/hosts
-protokube/pkg/gossip/mesh
-protokube/pkg/protokube
 upup/pkg/fi
 upup/pkg/fi/assettasks
 upup/pkg/fi/cloudup
diff --git a/protokube/pkg/gossip/dns/hosts/hosts.go b/protokube/pkg/gossip/dns/hosts/hosts.go
index efdd46535e..51778b2f9e 100644
--- a/protokube/pkg/gossip/dns/hosts/hosts.go
+++ b/protokube/pkg/gossip/dns/hosts/hosts.go
@@ -22,7 +22,6 @@ import (
 	"io/ioutil"
 	math_rand "math/rand"
 	"os"
-	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
@@ -158,50 +157,3 @@ func pseudoAtomicWrite(p string, b []byte, mode os.FileMode) error {
 		klog.Warningf("detected concurrent write to file %q, will retry", p)
 	}
 }
-
-func atomicWriteFile(filename string, data []byte, perm os.FileMode) error {
-	dir := filepath.Dir(filename)
-
-	tempFile, err := ioutil.TempFile(dir, ".tmp"+filepath.Base(filename))
-	if err != nil {
-		return fmt.Errorf("error creating temp file in %q: %v", dir, err)
-	}
-
-	mustClose := true
-	mustRemove := true
-
-	defer func() {
-		if mustClose {
-			if err := tempFile.Close(); err != nil {
-				klog.Warningf("error closing temp file: %v", err)
-			}
-		}
-
-		if mustRemove {
-			if err := os.Remove(tempFile.Name()); err != nil {
-				klog.Warningf("error removing temp file %q: %v", tempFile.Name(), err)
-			}
-		}
-	}()
-
-	if _, err := tempFile.Write(data); err != nil {
-		return fmt.Errorf("error writing temp file: %v", err)
-	}
-
-	if err := tempFile.Close(); err != nil {
-		return fmt.Errorf("error closing temp file: %v", err)
-	}
-
-	mustClose = false
-
-	if err := os.Chmod(tempFile.Name(), perm); err != nil {
-		return fmt.Errorf("error changing mode of temp file: %v", err)
-	}
-
-	if err := os.Rename(tempFile.Name(), filename); err != nil {
-		return fmt.Errorf("error moving temp file %q to %q: %v", tempFile.Name(), filename, err)
-	}
-
-	mustRemove = false
-	return nil
-}
diff --git a/protokube/pkg/gossip/mesh/gossip.go b/protokube/pkg/gossip/mesh/gossip.go
index f2650f3602..84cf4b4748 100644
--- a/protokube/pkg/gossip/mesh/gossip.go
+++ b/protokube/pkg/gossip/mesh/gossip.go
@@ -40,7 +40,7 @@ type MeshGossiper struct {
 	router *mesh.Router
 	peer   *peer
 
-	version uint64
+	//version uint64
 }
 
 func NewMeshGossiper(listen string, channelName string, nodeName string, password []byte, seeds gossip.SeedProvider) (*MeshGossiper, error) {
diff --git a/protokube/pkg/gossip/mesh/mesh.pb.go b/protokube/pkg/gossip/mesh/mesh.pb.go
index 7f480d80de..01dbf11481 100644
--- a/protokube/pkg/gossip/mesh/mesh.pb.go
+++ b/protokube/pkg/gossip/mesh/mesh.pb.go
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//lint:file-ignore U1000 - Generated code
+
 // Code generated by protoc-gen-gogo.
 // source: k8s.io/kops/protokube/pkg/gossip/mesh/mesh.proto
 // DO NOT EDIT!
diff --git a/protokube/pkg/protokube/etcd_cluster.go b/protokube/pkg/protokube/etcd_cluster.go
index 1a85b479bb..fc6815a1d6 100644
--- a/protokube/pkg/protokube/etcd_cluster.go
+++ b/protokube/pkg/protokube/etcd_cluster.go
@@ -95,10 +95,10 @@ type EtcdNode struct {
 
 // EtcdController defines the etcd controller
 type EtcdController struct {
-	kubeBoot   *KubeBoot
-	volume     *Volume
-	volumeSpec *etcd.EtcdClusterSpec
-	cluster    *EtcdCluster
+	kubeBoot *KubeBoot
+	//volume     *Volume
+	//volumeSpec *etcd.EtcdClusterSpec
+	cluster *EtcdCluster
 }
 
 // newEtcdController creates and returns a new etcd controller