Fix linting issues

cmd/k3s/main.go

@@ -105,13 +105,13 @@ func getAssetAndDir(dataDir string) (string, string) {
 
 func extract(dataDir string) (string, error) {
 	// first look for global asset folder so we don't create a HOME version if not needed
-	asset, dir := getAssetAndDir(datadir.DefaultDataDir)
+	_, dir := getAssetAndDir(datadir.DefaultDataDir)
 	if _, err := os.Stat(dir); err == nil {
 		logrus.Debugf("Asset dir %s", dir)
 		return dir, nil
 	}
 
-	asset, dir = getAssetAndDir(dataDir)
+	asset, dir := getAssetAndDir(dataDir)
 	if _, err := os.Stat(dir); err == nil {
 		logrus.Debugf("Asset dir %s", dir)
 		return dir, nil

pkg/agent/flannel/flannel.go

@@ -122,7 +122,7 @@ func WriteSubnetFile(path string, nw ip.IP4Net, ipMasq bool, bn backend.Network)
 	// Write out the first usable IP by incrementing
 	// sn.IP by one
 	sn := bn.Lease().Subnet
-	sn.IP += 1
+	sn.IP++
 
 	fmt.Fprintf(f, "FLANNEL_NETWORK=%s\n", nw)
 	fmt.Fprintf(f, "FLANNEL_SUBNET=%s\n", sn)

pkg/agent/flannel/setup.go

@@ -35,7 +35,7 @@ const (
   ]
 }
 `
-	netJson = `{
+	netJSON = `{
     "Network": "%CIDR%",
     "Backend": {
     "Type": "vxlan"
@@ -99,5 +99,5 @@ func createFlannelConf(config *config.Node) error {
 		return nil
 	}
 	return util.WriteFile(config.FlannelConf,
-		strings.Replace(netJson, "%CIDR%", config.AgentConfig.ClusterCIDR.String(), -1))
+		strings.Replace(netJSON, "%CIDR%", config.AgentConfig.ClusterCIDR.String(), -1))
 }

pkg/deploy/stage.go

@@ -2,11 +2,12 @@ package deploy
 
 import (
 	"bytes"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 func Stage(dataDir string, templateVars map[string]string, skipList []string) error {

pkg/server/server.go

@@ -137,8 +137,7 @@ func startNorman(ctx context.Context, config *Config) (string, error) {
 		},
 	}
 
-	ctx, _, err = normanConfig.Build(ctx, nil)
+	if _, _, err = normanConfig.Build(ctx, nil); err != nil {
-	if err != nil {
 		return "", err
 	}
 

pkg/servicelb/controller.go

@@ -222,7 +222,7 @@ func (h *handler) newDeployment(svc *core.Service) (*apps.Deployment, error) {
 
 	for _, node := range nodes {
 		if Ready.IsTrue(node) {
-			replicas += 1
+			replicas++
 		}
 		if replicas >= 2 {
 			break