This is an automated cherry-pick of #6781

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: liubog2008

cmd/discovery/main.go

@@ -93,6 +93,7 @@ func main() {
 	if tlsEnabled == strconv.FormatBool(true) {
 		tcTls = true
 	}
+	discoveryMTLS := os.Getenv("DISCOVERY_MTLS_ENABLED") == strconv.FormatBool(true)
 	// informers
 	options := []kubeinformers.SharedInformerOption{
 		kubeinformers.WithNamespace(os.Getenv("MY_POD_NAMESPACE")),
@@ -113,7 +114,16 @@ func main() {
 		klog.Infof("starting TiDB Discovery server, listening on %s", addr)
 		lister := kubeInformerFactory.Core().V1().Secrets().Lister()
 		discoveryServer := server.NewServer(pdapi.NewDefaultPDControl(lister), dmapi.NewDefaultMasterControl(lister), cli, kubeCli)
-		discoveryServer.ListenAndServe(addr)
+		if discoveryMTLS {
+			klog.Infof("mTLS enabled for discovery server")
+			discoveryServer.ListenAndServeTLS(addr,
+				"/var/lib/discovery-tls/tls.crt",
+				"/var/lib/discovery-tls/tls.key",
+				"/var/lib/discovery-tls/ca.crt",
+			)
+		} else {
+			discoveryServer.ListenAndServe(addr)
+		}
 	}, 5*time.Second)
 	go wait.Forever(func() {
 		addr := fmt.Sprintf("0.0.0.0:%d", proxyPort)

docs/api-references/docs.md

@@ -16908,6 +16908,23 @@ For Client: kubectl create secret generic <clusterName>-cluster-client-secret &n
 Same for other components.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>enableDiscoveryMTLS</code></br>
+<em>
+bool
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>EnableDiscoveryMTLS indicates whether to enable mutual TLS on the discovery server (port 10261).
+When enabled, the discovery server presents its own certificate, and all components must present
+a client certificate when calling the discovery service.
+A single secret named <clusterName>-discovery-cluster-secret must be created containing ca.crt,
+tls.crt and tls.key, and will be mounted to both the discovery server pod and all component pods.
+This field only takes effect when Enabled is true.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="tlsconfig">TLSConfig</h3>

manifests/crd.yaml

@@ -18996,6 +18996,8 @@ spec:
                 type: array
               tlsCluster:
                 properties:
+                  enableDiscoveryMTLS:
+                    type: boolean
                   enabled:
                     type: boolean
                 type: object
@@ -51793,6 +51795,8 @@ spec:
                 type: object
               tlsCluster:
                 properties:
+                  enableDiscoveryMTLS:
+                    type: boolean
                   enabled:
                     type: boolean
                 type: object

manifests/crd/v1/pingcap.com_dmclusters.yaml

@@ -6199,6 +6199,8 @@ spec:
                 type: array
               tlsCluster:
                 properties:
+                  enableDiscoveryMTLS:
+                    type: boolean
                   enabled:
                     type: boolean
                 type: object

manifests/crd/v1/pingcap.com_tidbclusters.yaml

@@ -26322,6 +26322,8 @@ spec:
                 type: object
               tlsCluster:
                 properties:
+                  enableDiscoveryMTLS:
+                    type: boolean
                   enabled:
                     type: boolean
                 type: object

pkg/apis/pingcap/v1alpha1/tidbcluster.go

@@ -1035,6 +1035,10 @@ func (tc *TidbCluster) IsTLSClusterEnabled() bool {
 	return tc.Spec.TLSCluster != nil && tc.Spec.TLSCluster.Enabled
 }
 
+func (tc *TidbCluster) IsDiscoveryMTLSEnabled() bool {
+	return tc.IsTLSClusterEnabled() && tc.Spec.TLSCluster.EnableDiscoveryMTLS
+}
+
 func (tc *TidbCluster) IsRecoveryMode() bool {
 	return tc.Spec.RecoveryMode
 }

pkg/apis/pingcap/v1alpha1/types.go

@@ -1947,6 +1947,15 @@ type TLSCluster struct {
 	//        Same for other components.
 	// +optional
 	Enabled bool `json:"enabled,omitempty"`
+
+	// EnableDiscoveryMTLS indicates whether to enable mutual TLS on the discovery server (port 10261).
+	// When enabled, the discovery server presents its own certificate, and all components must present
+	// a client certificate when calling the discovery service.
+	// A single secret named <clusterName>-discovery-cluster-secret must be created containing ca.crt,
+	// tls.crt and tls.key, and will be mounted to both the discovery server pod and all component pods.
+	// This field only takes effect when Enabled is true.
+	// +optional
+	EnableDiscoveryMTLS bool `json:"enableDiscoveryMTLS,omitempty"`
 }
 
 // +genclient

pkg/controller/tidbcluster/pod_control_test.go

@@ -93,13 +93,9 @@ func TestTiKVPodSyncForEviction(t *testing.T) {
 	})
 
 	stop := make(chan struct{})
-	go func() {
-		deps.KubeInformerFactory.Start(stop)
-	}()
+	deps.KubeInformerFactory.Start(stop)
 	deps.KubeInformerFactory.WaitForCacheSync(stop)
-	go func() {
-		deps.InformerFactory.Start(stop)
-	}()
+	deps.InformerFactory.Start(stop)
 	deps.InformerFactory.WaitForCacheSync(stop)
 
 	defer close(stop)
@@ -577,13 +573,9 @@ func TestPDPodSyncForLeaderTransfer(t *testing.T) {
 			podController.testPDClient = pdClient
 
 			stop := make(chan struct{})
-			go func() {
-				deps.KubeInformerFactory.Start(stop)
-			}()
+			deps.KubeInformerFactory.Start(stop)
 			deps.KubeInformerFactory.WaitForCacheSync(stop)
-			go func() {
-				deps.InformerFactory.Start(stop)
-			}()
+			deps.InformerFactory.Start(stop)
 			deps.InformerFactory.WaitForCacheSync(stop)
 
 			defer close(stop)
@@ -753,13 +745,9 @@ func TestTiDBPodSyncForGracefulShutdown(t *testing.T) {
 			podController := NewPodController(deps)
 
 			stop := make(chan struct{})
-			go func() {
-				deps.KubeInformerFactory.Start(stop)
-			}()
+			deps.KubeInformerFactory.Start(stop)
 			deps.KubeInformerFactory.WaitForCacheSync(stop)
-			go func() {
-				deps.InformerFactory.Start(stop)
-			}()
+			deps.InformerFactory.Start(stop)
 			deps.InformerFactory.WaitForCacheSync(stop)
 
 			defer close(stop)

pkg/discovery/server/interface.go

@@ -15,4 +15,5 @@ package server
 
 type Server interface {
 	ListenAndServe(addr string)
+	ListenAndServeTLS(addr, certFile, keyFile, caFile string)
 }

pkg/discovery/server/proxy.go

@@ -101,3 +101,7 @@ func (p *proxyServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 func (p *proxyServer) ListenAndServe(addr string) {
 	klog.Fatal(http.ListenAndServe(addr, p))
 }
+
+func (p *proxyServer) ListenAndServeTLS(addr, certFile, keyFile, caFile string) {
+	klog.Fatal("proxy server does not support mTLS")
+}