Merge pull request #2073 from fisherxu/release-1.4v1.4.0origin/release-1.4

update keadm to get latest version from kubeedge.io

5 files changed, 8 insertions, 17 deletions

diff --git a/CHANGELOG-1.3.md b/CHANGELOG-1.3.md
index 256e9061a..0188c735f 100644
--- a/CHANGELOG-1.3.md
+++ b/CHANGELOG-1.3.md
@@ -17,7 +17,7 @@
   * [v1.3.0-beta.0](#v130-beta0)
      * [Changelog since v1.2.0](#changelog-since-v120)
         * [Bug Fixes](#bug-fixes-1)
-        
+
 # v1.3.1
 
 ## Downloads for v1.3.1
diff --git a/keadm/cmd/keadm/app/cmd/cloud/init.go b/keadm/cmd/keadm/app/cmd/cloud/init.go
index bd77c2a04..42f39093e 100644
--- a/keadm/cmd/keadm/app/cmd/cloud/init.go
+++ b/keadm/cmd/keadm/app/cmd/cloud/init.go
@@ -117,7 +117,8 @@ func Add2ToolsList(toolList map[string]types.ToolsInstaller, flagData map[string
 		for i := 0; i < util.RetryTimes; i++ {
 			version, err := util.GetLatestVersion()
 			if err != nil {
-				return err
+				fmt.Println("Failed to get the latest KubeEdge release version")
+				continue
 			}
 			if len(version) > 0 {
 				kubeVer = strings.TrimPrefix(version, "v")
diff --git a/keadm/cmd/keadm/app/cmd/common/constant.go b/keadm/cmd/keadm/app/cmd/common/constant.go
index 105c7b784..36bdd56af 100644
--- a/keadm/cmd/keadm/app/cmd/common/constant.go
+++ b/keadm/cmd/keadm/app/cmd/common/constant.go
@@ -60,7 +60,7 @@ const (
 	RuntimeType = "runtimetype"
 
 	// DefaultKubeEdgeVersion is the default KubeEdge version
-	DefaultKubeEdgeVersion = "1.3.1"
+	DefaultKubeEdgeVersion = "1.4.0"
 
 	// Token sets the token used when edge applying for the certificate
 	Token = "token"
diff --git a/keadm/cmd/keadm/app/cmd/edge/join.go b/keadm/cmd/keadm/app/cmd/edge/join.go
index 989a4c6fb..6a6f6f013 100644
--- a/keadm/cmd/keadm/app/cmd/edge/join.go
+++ b/keadm/cmd/keadm/app/cmd/edge/join.go
@@ -132,7 +132,8 @@ func Add2ToolsList(toolList map[string]types.ToolsInstaller, flagData map[string
 		for i := 0; i < util.RetryTimes; i++ {
 			version, err := util.GetLatestVersion()
 			if err != nil {
-				return err
+				fmt.Println("Failed to get the latest KubeEdge release version")
+				continue
 			}
 			if len(version) > 0 {
 				kubeVer = strings.TrimPrefix(version, "v")
diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go
index 0c67d25ac..c3df49234 100644
--- a/keadm/cmd/keadm/app/cmd/util/common.go
+++ b/keadm/cmd/keadm/app/cmd/util/common.go
@@ -28,7 +28,6 @@ import (
 	"sync"
 
 	"github.com/spf13/pflag"
-	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
@@ -70,14 +69,10 @@ const (
 
 	KubeEdgeCRDDownloadURL = "https://raw.githubusercontent.com/kubeedge/kubeedge/master/build/crds"
 
-	latestReleaseVersionURL = "https://api.github.com/repos/kubeedge/kubeedge/releases/latest"
+	latestReleaseVersionURL = "https://kubeedge.io/latestversion"
 	RetryTimes              = 5
 )
 
-type latestReleaseVersion struct {
-	TagName string `json:"tag_name"`
-}
-
 //AddToolVals gets the value and default values of each flags and collects them in temporary cache
 func AddToolVals(f *pflag.Flag, flagData map[string]types.FlagData) {
 	flagData[f.Name] = types.FlagData{Val: f.Value.String(), DefVal: f.DefValue}
@@ -249,13 +244,7 @@ func GetLatestVersion() (string, error) {
 		return "", err
 	}
 
-	latestRelease := &latestReleaseVersion{}
-	err = json.Unmarshal(latestReleaseData, latestRelease)
-	if err != nil {
-		return "", err
-	}
-
-	return latestRelease.TagName, nil
+	return string(latestReleaseData), nil
 }
 
 // runCommandWithShell executes the given command with "sh -c".