optimize code

pingcap · Oct 25, 2024 · 33fe843 · 33fe843
1 parent 5a0911f
commit 33fe843
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/pkg/manager/member/ticdc_member_manager.go b/pkg/manager/member/ticdc_member_manager.go
@@ -391,10 +391,6 @@ func getNewTiCDCStatefulSet(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (*ap
 		vols = append(vols, annVolume)
 	}
 
-	clusterTLSSecretName := util.ClusterTLSSecretName(tc.Name, label.TiCDCLabelVal)
-	if tc.Spec.TiCDC.ClusterTLSSecretName != "" {
-		clusterTLSSecretName = tc.Spec.TiCDC.ClusterTLSSecretName
-	}
 	if tc.IsTLSClusterEnabled() {
 		volMounts = append(volMounts, corev1.VolumeMount{
 			Name:      ticdcCertVolumeMount,
@@ -409,7 +405,7 @@ func getNewTiCDCStatefulSet(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (*ap
 		vols = append(vols, corev1.Volume{
 			Name: ticdcCertVolumeMount, VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: clusterTLSSecretName,
+					SecretName: getTiCDCClusterTLSCertSecretName(tc),
 				},
 			},
 		}, corev1.Volume{
@@ -570,6 +566,15 @@ func getNewTiCDCStatefulSet(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (*ap
 	return ticdcSts, nil
 }
 
+func getTiCDCClusterTLSCertSecretName(tc *v1alpha1.TidbCluster) string {
+	clusterTLSSecretName := util.ClusterTLSSecretName(tc.Name, label.TiCDCLabelVal)
+	if tc.Spec.TiCDC.ClusterTLSSecretName != "" {
+		clusterTLSSecretName = tc.Spec.TiCDC.ClusterTLSSecretName
+	}
+
+	return clusterTLSSecretName
+}
+
 func labelTiCDC(tc *v1alpha1.TidbCluster) label.Label {
 	instanceName := tc.GetInstanceName()
 	return label.New().Instance(instanceName).TiCDC()