fixing lint and other random incorrect stuff
parent
feaa9fc3b3
commit
3d72152953
|
@ -229,8 +229,9 @@ func deleteProfile(profile *pkg_config.Profile) error {
|
|||
delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err))
|
||||
deletionError.Err = delErr
|
||||
e = deletionError
|
||||
} else {
|
||||
e = err
|
||||
}
|
||||
e = err
|
||||
}
|
||||
}
|
||||
if e != nil {
|
||||
|
|
|
@ -355,7 +355,10 @@ func runStart(cmd *cobra.Command, args []string) {
|
|||
|
||||
numNodes := viper.GetInt(nodes)
|
||||
if numNodes > 1 {
|
||||
for i := 0; i < numNodes-1; i++ {
|
||||
if driver.IsKIC(driverName) {
|
||||
out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
|
||||
}
|
||||
for i := 1; i < numNodes; i++ {
|
||||
nodeName := fmt.Sprintf("%s%d", n.Name, i+1)
|
||||
n := config.Node{
|
||||
Name: nodeName,
|
||||
|
@ -363,7 +366,10 @@ func runStart(cmd *cobra.Command, args []string) {
|
|||
ControlPlane: false,
|
||||
KubernetesVersion: mc.KubernetesConfig.KubernetesVersion,
|
||||
}
|
||||
node.Add(&mc, n)
|
||||
err := node.Add(&mc, n)
|
||||
if err != nil {
|
||||
exit.WithError("adding node", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -371,7 +371,7 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
|
|||
fmt.Println(joinCmd)
|
||||
out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "cmd failed: %s\n%s\n", joinCmd, out)
|
||||
return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out)
|
||||
}
|
||||
|
||||
if _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", "sudo systemctl daemon-reload && sudo systemctl enable kubelet && sudo systemctl start kubelet")); err != nil {
|
||||
|
|
|
@ -52,7 +52,6 @@ const (
|
|||
embedCerts = "embed-certs"
|
||||
keepContext = "keep-context"
|
||||
imageRepository = "image-repository"
|
||||
containerRuntime = "container-runtime"
|
||||
)
|
||||
|
||||
// InitialSetup performs all necessary operations on the initial control plane node when first spinning up a cluster
|
||||
|
@ -165,7 +164,10 @@ func StartMachine(cfg *config.ClusterConfig, node *config.Node) (runner command.
|
|||
}
|
||||
|
||||
node.IP = ip
|
||||
config.SaveNode(cfg, node)
|
||||
err = config.SaveNode(cfg, node)
|
||||
if err != nil {
|
||||
exit.WithError("saving node", err)
|
||||
}
|
||||
|
||||
return runner, preExists, m, host
|
||||
}
|
||||
|
|
|
@ -30,8 +30,6 @@ const (
|
|||
waitUntilHealthy = "wait"
|
||||
cacheImageConfigKey = "cache"
|
||||
containerRuntime = "container-runtime"
|
||||
embedCerts = "embed-certs"
|
||||
keepContext = "keep-context"
|
||||
mountString = "mount-string"
|
||||
createMount = "mount"
|
||||
waitTimeout = "wait-timeout"
|
||||
|
|
|
@ -88,7 +88,10 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
|
|||
}
|
||||
}
|
||||
|
||||
bs.SetupCerts(cc.KubernetesConfig, n)
|
||||
err = bs.SetupCerts(cc.KubernetesConfig, n)
|
||||
if err != nil {
|
||||
exit.WithError("setting up certs", err)
|
||||
}
|
||||
|
||||
cp, err := config.PrimaryControlPlane(cc)
|
||||
if err != nil {
|
||||
|
@ -99,6 +102,9 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
|
|||
exit.WithError("Getting bootstrapper", err)
|
||||
}
|
||||
joinCmd, err := cpBs.GenerateToken(cc.KubernetesConfig)
|
||||
if err != nil {
|
||||
exit.WithError("generating join token", err)
|
||||
}
|
||||
return bs.JoinCluster(cc, n, joinCmd)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue