cluster: fix mistake error about TLS (#1612)

pingcap · Nov 9, 2021 · 109ebff · 109ebff
1 parent 440fe98
commit 109ebff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/cluster/manager/deploy.go b/pkg/cluster/manager/deploy.go
@@ -89,7 +89,8 @@ func (m *Manager) Deploy(
 		return err
 	}
 	if clusterSpec, ok := topo.(*spec.Specification); ok {
-		if semver.Compare(clusterVersion, "v4.0.5") < 0 &&
+		if clusterSpec.GlobalOptions.TLSEnabled &&
+			semver.Compare(clusterVersion, "v4.0.5") < 0 &&
 			len(clusterSpec.TiFlashServers) > 0 {
 			return fmt.Errorf("TiFlash %s is not supported in TLS enabled cluster", clusterVersion)
 		}

diff --git a/pkg/cluster/manager/scale_out.go b/pkg/cluster/manager/scale_out.go
@@ -80,7 +80,8 @@ func (m *Manager) ScaleOut(
 	}
 
 	if clusterSpec, ok := topo.(*spec.Specification); ok {
-		if semver.Compare(base.Version, "v4.0.5") < 0 &&
+		if clusterSpec.GlobalOptions.TLSEnabled &&
+			semver.Compare(base.Version, "v4.0.5") < 0 &&
 			len(clusterSpec.TiFlashServers) > 0 {
 			return fmt.Errorf("TiFlash %s is not supported in TLS enabled cluster", base.Version)
 		}