feat(update): update k3s version

update k3s version Signed-off-by: ysicing <i@ysicing.me>
ysicing · Mar 18, 2022 · 456df2d · 456df2d
1 parent ff68f78
commit 456df2d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/cmd/kube/k3s.go b/cmd/kube/k3s.go
@@ -20,7 +20,6 @@ import (
 	es "github.com/ysicing/ergo/pkg/daemon/service"
 	"github.com/ysicing/ergo/pkg/downloader"
 	"github.com/ysicing/ergo/pkg/util/factory"
-	"github.com/ysicing/ergo/pkg/util/ssh"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -79,7 +78,7 @@ func getbin() (string, error) {
 	filebin, err := exec.LookPath(common.K3sBinName)
 	if err != nil {
 		klog.Infof("not found k3s bin, will down k3s %v", common.K3sBinVersion)
-		if _, err := downloader.Download(common.K3sBinURL, common.K3sBinPath); err != nil {
+		if _, err := downloader.Download(common.GetK3SURL(), common.K3sBinPath); err != nil {
 			return "", err
 		}
 		os.Chmod(common.K3sBinPath, common.FileMode0755)
@@ -196,9 +195,6 @@ func initAction(cmd *cobra.Command, args []string) error {
 	}
 	klog.Donef("%v get nodes", kubectlbin)
 	klog.WriteString(string(getnodesoutput))
-	if err := checkhelm(); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -293,20 +289,3 @@ func checkBin(cmd string) bool {
 	_, err := exec.LookPath(cmd)
 	return err == nil
 }
-
-// checkhelm check helm
-func checkhelm() error {
-	cmdArgs := os.Args
-	klog := log.GetInstance()
-	if checkBin("helm") {
-		return nil
-	}
-	klog.Infof("helm not found, will try to install")
-	// Download helm
-	klog.Debug("Download helm")
-	if err := ssh.RunCmd(cmdArgs[0], "addons", "ysicing/helm"); err != nil {
-		klog.Errorf("install helm err: %v", err)
-		return err
-	}
-	return nil
-}
diff --git a/common/func.go b/common/func.go
@@ -55,3 +55,8 @@ func GetDefaultErgoCfg() string {
 	home := GetDefaultCfgDir()
 	return home + "/ergo.yml"
 }
+
+// GetK3SURL 获取k3s地址
+func GetK3SURL() string {
+	return fmt.Sprintf("%s/%s/k3s", K3sBinURL, K3sBinVersion)
+}
diff --git a/common/vars.go b/common/vars.go
@@ -30,7 +30,7 @@ const (
 	K3sBinName    = "k3s"
 	K3sBinPath    = "/usr/local/bin/k3s"
 	K3sBinVersion = "v1.23.4+k3s1"
-	K3sBinURL     = "https://github.com/k3s-io/k3s/releases/download/v1.23.1%2Bk3s2/k3s"
+	K3sBinURL     = "https://github.com/k3s-io/k3s/releases/download"
 	K3sAgentEnv   = "/etc/systemd/system/k3s-agent.service.env"
 	K3sKubeConfig = "/etc/rancher/k3s/k3s.yaml"
 	CiliumName    = "cilium"