fix TLS

pingcap · Sep 22, 2022 · 8aa2e53 · 8aa2e53
1 parent 30fe1ef
commit 8aa2e53
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/embed/templates/scripts/run_tidb-dashboard.sh.tpl b/embed/templates/scripts/run_tidb-dashboard.sh.tpl
@@ -30,7 +30,7 @@ exec bin/tidb-dashboard \
 {{- if .TLSEnabled}}
     --tidb-ca tls/ca.crt \
     --tidb-cert tls/tidb-dashboard.crt \
-    --tidb-key tls/tidb-dasboard.pem \
+    --tidb-key tls/tidb-dashboard.pem \
 {{- end}}
     1>> "{{.LogDir}}/tidb_dashboard.log" \
     2>> "{{.LogDir}}/tidb_dashboard_stderr.log"
diff --git a/pkg/cluster/spec/dashboard.go b/pkg/cluster/spec/dashboard.go
@@ -171,6 +171,7 @@ func (i *DashboardInstance) InitConfig(
 		Port:        spec.Port,
 		NumaNode:    spec.NumaNode,
 		Endpoints:   topo.Endpoints(deployUser),
+		TLSEnabled:  enableTLS,
 	}
 
 	fp := filepath.Join(paths.Cache, fmt.Sprintf("run_tidb-dashboard_%s_%d.sh", i.GetHost(), i.GetPort()))
@@ -190,12 +191,6 @@ func (i *DashboardInstance) InitConfig(
 
 	globalConfig := topo.ServerConfigs.Dashboard
 
-	// set TLS configs
-	spec.Config, err = i.setTLSConfig(ctx, enableTLS, spec.Config, paths)
-	if err != nil {
-		return err
-	}
-
 	if err := i.MergeServerConfig(ctx, e, globalConfig, spec.Config, paths); err != nil {
 		return err
 	}

diff --git a/pkg/cluster/spec/validate.go b/pkg/cluster/spec/validate.go
@@ -937,6 +937,8 @@ func (s *Specification) validateTLSEnabled() error {
 			ComponentPump,
 			ComponentDrainer,
 			ComponentCDC,
+			ComponentTiKVCDC,
+			ComponentDashboard,
 			ComponentPrometheus,
 			ComponentAlertmanager,
 			ComponentGrafana: