try not use bindversion

pingcap · Sep 7, 2023 · b004a4c · b004a4c
1 parent 8aa3423
commit b004a4c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/pkg/cluster/manager/builder.go b/pkg/cluster/manager/builder.go
@@ -172,7 +172,7 @@ func buildScaleOutTask(
 	var iterErr error
 	// Deploy the new topology and refresh the configuration
 	newPart.IterInstance(func(inst spec.Instance) {
-		version := inst.CalculateVersion(m.bindVersion(inst.ComponentName(), base.Version))
+		version := inst.CalculateVersion(base.Version)
 		deployDir := spec.Abs(base.User, inst.DeployDir())
 		// data dir would be empty for components which don't need it
 		dataDirs := spec.MultiDirAbs(base.User, inst.DataDir())
@@ -235,9 +235,9 @@ func buildScaleOutTask(
 			// data dir would be empty for components which don't need it
 			// Download and copy the latest component to remote if the cluster is imported from Ansible
 			tb := task.NewBuilder(m.logger)
+			version := inst.CalculateVersion(base.Version)
 			switch compName := inst.ComponentName(); compName {
 			case spec.ComponentGrafana, spec.ComponentPrometheus, spec.ComponentAlertmanager:
-				version := m.bindVersion(compName, base.Version)
 				tb.Download(compName, inst.OS(), inst.Arch(), version).
 					CopyComponent(compName, inst.OS(), inst.Arch(), version, "", inst.GetManageHost(), deployDir)
 			}
@@ -639,9 +639,9 @@ func buildInitConfigTasks(
 		// Download and copy the latest component to remote if the cluster is imported from Ansible
 		tb := task.NewBuilder(m.logger)
 		if instance.IsImported() {
+			version := instance.CalculateVersion(base.Version)
 			switch compName {
 			case spec.ComponentGrafana, spec.ComponentPrometheus, spec.ComponentAlertmanager:
-				version := m.bindVersion(compName, base.Version)
 				tb.Download(compName, instance.OS(), instance.Arch(), version).
 					CopyComponent(
 						compName,
@@ -699,7 +699,7 @@ func buildDownloadCompTasks(
 				// download spark as dependency of tispark
 				tasks = append(tasks, buildDownloadSparkTask(inst, logger, gOpt))
 			} else {
-				version = inst.CalculateVersion(bindVersion(inst.ComponentName(), clusterVersion))
+				version = inst.CalculateVersion(clusterVersion)
 			}
 
 			t := task.NewBuilder(logger).

diff --git a/pkg/cluster/manager/deploy.go b/pkg/cluster/manager/deploy.go
@@ -249,8 +249,8 @@ func (m *Manager) Deploy(
 
 	// Deploy components to remote
 	topo.IterInstance(func(inst spec.Instance) {
-		version := inst.CalculateVersion(m.bindVersion(inst.ComponentName(), clusterVersion))
-		inst.SetVersion(version)
+		version := inst.CalculateVersion(clusterVersion)
+		//inst.SetVersion(version)
 		deployDir := spec.Abs(globalOptions.User, inst.DeployDir())
 		// data dir would be empty for components which don't need it
 		dataDirs := spec.MultiDirAbs(globalOptions.User, inst.DataDir())

diff --git a/pkg/cluster/manager/patch.go b/pkg/cluster/manager/patch.go
@@ -145,7 +145,7 @@ func checkPackage(bindVersion spec.BindVersion, specManager *spec.SpecManager, n
 		return err
 	}
 
-	ver := inst.CalculateVersion(bindVersion(inst.ComponentName(), metadata.GetBaseMeta().Version))
+	ver := inst.CalculateVersion(metadata.GetBaseMeta().Version)
 	repo, err := clusterutil.NewRepository(nodeOS, arch)
 	if err != nil {
 		return err

diff --git a/pkg/cluster/manager/upgrade.go b/pkg/cluster/manager/upgrade.go
@@ -106,10 +106,13 @@ Do you want to continue? [y/N]:`,
 
 			// if component version is not specified, use the cluster version or latest("")
 			version := componentVersions[compName]
-			if version == "" {
-				version = m.bindVersion(compName, clusterVersion)
+			//if version == "" {
+			//	version = m.bindVersion(compName, clusterVersion)
+			//}
+			if version != "" {
+				inst.SetVersion(version)
 			}
-			inst.SetVersion(version)
+			version = inst.CalculateVersion(clusterVersion)
 
 			// Download component from repository
 			key := fmt.Sprintf("%s-%s-%s-%s", compName, version, inst.OS(), inst.Arch())