Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linting issues

Browse Source
This commit is contained in:
Erik Wilson 2019-03-24 21:54:52 -07:00
parent 1f82d834e7
commit 1d61576e54
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/k3s/main.go
View File

@ -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

2
pkg/agent/flannel/flannel.go
View File

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

4
pkg/agent/flannel/setup.go
View File

@ -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))
}

6
pkg/cli/cmds/server.go
View File

@ -16,7 +16,7 @@ type Server struct {
DisableAgent bool
KubeConfigOutput string
KubeConfigMode string
KnownIPs cli.StringSlice
KnownIPs cli.StringSlice
}
var ServerConfig Server
@ -96,8 +96,8 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
EnvVar: "K3S_KUBECONFIG_MODE",
},
cli.StringSliceFlag{
Name: "tls-san",
Usage: "Add additional hostname or IP as a Subject Alternative Name in the TLS cert",
Name: "tls-san",
Usage: "Add additional hostname or IP as a Subject Alternative Name in the TLS cert",
Value: &ServerConfig.KnownIPs,
},
NodeIPFlag,

5
pkg/deploy/stage.go
View File

@ -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 {

3
pkg/server/server.go
View File

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

2
pkg/servicelb/controller.go
View File

@ -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