fix(installer): move patch version step location (#1039)

tkestack · Dec 31, 2020 · f0a9a86 · f0a9a86
1 parent bbf47fb
commit f0a9a86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmd/tke-installer/app/installer/installer.go b/cmd/tke-installer/app/installer/installer.go
@@ -213,10 +213,6 @@ func (t *TKE) initSteps() {
 			Name: "Create global cluster",
 			Func: t.createGlobalCluster,
 		},
-		{
-			Name: "Patch platform versions in cluster info",
-			Func: t.patchPlatformVersion,
-		},
 		{
 			Name: "Write kubeconfig",
 			Func: t.writeKubeconfig,
@@ -245,6 +241,10 @@ func (t *TKE) initSteps() {
 			Name: "Install etcd",
 			Func: t.installETCD,
 		},
+		{
+			Name: "Patch platform versions in cluster info",
+			Func: t.patchPlatformVersion,
+		},
 	}...)
 
 	if t.Para.Config.Auth.TKEAuth != nil {

diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -19,11 +19,13 @@
 package spec
 
 import (
+	"os"
+
 	"github.com/thoas/go-funk"
 )
 
 var (
-	TKEVersion    = "1.5.0"
+	TKEVersion    = os.Getenv("VERSION")
 	Archs         = []string{"amd64", "arm64"}
 	Arm64         = "arm64"
 	Arm64Variants = []string{"v8", "unknown"}