Revert "opt(ticdc): support to overwrite the default cluster TLS cert…

… secret …" (#5823) This reverts commit 8cb0848.
pingcap · Oct 30, 2024 · 9be8dff · 9be8dff
1 parent 8cb0848
commit 9be8dff
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 78 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -16586,34 +16586,6 @@ client certificates for the downstream.</p>
 </tr>
 <tr>
 <td>
-<code>clusterTLSSecretName</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>ClusterTLSSecretName is used for overwriting the default mTLS cert secret name (see also: pkg/util/util.go:ClusterTLSSecretName)
-This field is useful for sharing the same mTLS cert secret for multiple ticdc clusters connecting to the same upstream tidb cluster.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>clusterClientTLSSecretName</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>ClusterTLSSecretName is used for overwriting the default <strong>cluster client</strong> cert secret name (see also: pkg/util/util.go:ClusterClientTLSSecretName)
-This field is useful for sharing the same cluster client cert secret for multiple ticdc clusters connecting to the same upstream tidb cluster.
-The ClusterClientTLSSecret is actually not directly used by ticdc, but it is useful for executing some commands via <code>ticdc-ctl</code>
-by <code>kubectl exec -it ticdc-0 -- /cdc cli --ca /var/lib/cluster-client-tls/ca.crt --cert /var/lib/cluster-client-tls/tls.crt --key /var/lib/cluster-client-tls/tls.key ...</code>.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>baseImage</code></br>
 <em>
 string

diff --git a/manifests/crd/v1/pingcap.com_tidbclusters.yaml b/manifests/crd/v1/pingcap.com_tidbclusters.yaml
@@ -13152,10 +13152,6 @@ spec:
                     x-kubernetes-list-map-keys:
                     - name
                     x-kubernetes-list-type: map
-                  clusterClientTLSSecretName:
-                    type: string
-                  clusterTLSSecretName:
-                    type: string
                   config:
                     x-kubernetes-preserve-unknown-fields: true
                   configUpdateStrategy:

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go
@@ -859,18 +859,6 @@ type TiCDCSpec struct {
 	// +optional
 	TLSClientSecretNames []string `json:"tlsClientSecretNames,omitempty"`
 
-	// ClusterTLSSecretName is used for overwriting the default mTLS cert secret name (see also: pkg/util/util.go:ClusterTLSSecretName)
-	// This field is useful for sharing the same mTLS cert secret for multiple ticdc clusters connecting to the same upstream tidb cluster.
-	// +optional
-	ClusterTLSSecretName string `json:"clusterTLSSecretName,omitempty"`
-
-	// ClusterTLSSecretName is used for overwriting the default **cluster client** cert secret name (see also: pkg/util/util.go:ClusterClientTLSSecretName)
-	// This field is useful for sharing the same cluster client cert secret for multiple ticdc clusters connecting to the same upstream tidb cluster.
-	// The ClusterClientTLSSecret is actually not directly used by ticdc, but it is useful for executing some commands via `ticdc-ctl`
-	//  by `kubectl exec -it ticdc-0 -- /cdc cli --ca /var/lib/cluster-client-tls/ca.crt --cert /var/lib/cluster-client-tls/tls.crt --key /var/lib/cluster-client-tls/tls.key ...`.
-	// +optional
-	ClusterClientTLSSecretName string `json:"clusterClientTLSSecretName,omitempty"`
-
 	// Base image of the component, image tag is now allowed during validation
 	// +kubebuilder:default=pingcap/ticdc
 	// +optional

diff --git a/pkg/manager/member/ticdc_member_manager.go b/pkg/manager/member/ticdc_member_manager.go
@@ -405,13 +405,13 @@ func getNewTiCDCStatefulSet(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (*ap
 		vols = append(vols, corev1.Volume{
 			Name: ticdcCertVolumeMount, VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: getTiCDCClusterTLSCertSecretName(tc),
+					SecretName: util.ClusterTLSSecretName(tc.Name, label.TiCDCLabelVal),
 				},
 			},
 		}, corev1.Volume{
 			Name: util.ClusterClientVolName, VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: getTiCDCClusterClientTLSCertSecretName(tc),
+					SecretName: util.ClusterClientTLSSecretName(tc.Name),
 				},
 			},
 		})
@@ -566,24 +566,6 @@ 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 getTiCDCClusterClientTLSCertSecretName(tc *v1alpha1.TidbCluster) string {
-	clusterClientTLSSecretName := util.ClusterClientTLSSecretName(tc.Name)
-	if tc.Spec.TiCDC.ClusterClientTLSSecretName != "" {
-		clusterClientTLSSecretName = tc.Spec.TiCDC.ClusterClientTLSSecretName
-	}
-
-	return clusterClientTLSSecretName
-}
-
 func labelTiCDC(tc *v1alpha1.TidbCluster) label.Label {
 	instanceName := tc.GetInstanceName()
 	return label.New().Instance(instanceName).TiCDC()