diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2536e7b4581..dc7ef3bd556 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -27,49 +27,26 @@ For example:
 
 ### Code changes
 
-<<<<<<< HEAD
- - Unit test
- - E2E test
- - Stability test
- - Manual test (add detailed scripts or steps below)
- - No code
-=======
 - [ ] Has Go code change
 - [ ] Has CI related scripts change
->>>>>>> b911de1e... improve github PR template (#3559)
 
 ### Tests
 <!-- AT LEAST ONE test must be included. -->
 
-<<<<<<< HEAD
- - Has Go code change
- - Has CI related scripts change
- - Has Terraform scripts change
-=======
 - [ ] Unit test <!-- If you added any unit test cases, check this box -->
 - [ ] E2E test <!-- If you added any e2e test cases, check this box -->
 - [ ] Manual test <!-- If this PR needs manual test, check this box, and add detailed manual test scripts or steps below, so that ANYONE CAN REPRODUCE IT. Ref: https://github.com/pingcap/tidb-operator/pull/3517 -->
 - [ ] No code <!-- If this PR contains no code changes, check this box -->
->>>>>>> b911de1e... improve github PR template (#3559)
 
 ### Side effects
 
-<<<<<<< HEAD
- - Breaking backward compatibility
-=======
 - [ ] Breaking backward compatibility <!-- If this PR breaks things deployed with previous TiDB Operator versions, check this box -->
 - [ ] Other side effects: <!-- Any other side effects, such as requiring additional storage / consumes substantial memory / potential reconciliation latency -->
->>>>>>> b911de1e... improve github PR template (#3559)
 
 ### Related changes
 
-<<<<<<< HEAD
- - Need to cherry-pick to the release branch
- - Need to update the documentation
-=======
 - [ ] Need to cherry-pick to the release branch <!-- If this PR should also appear in the current release branch, check this box -->
 - [ ] Need to update the documentation <!-- If this PR introduces new features or changes previous usages, check this box -->
->>>>>>> b911de1e... improve github PR template (#3559)
 
 ### Release Notes
 <!--
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
index e200ef3eab7..fec6c220939 100644
--- a/docs/api-references/docs.md
+++ b/docs/api-references/docs.md
@@ -950,8 +950,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting logic introduced
-TiDB cluster version</p>
+<p>TiDB cluster version</p>
 </td>
 </tr>
 <tr>
@@ -1074,7 +1073,8 @@ Kubernetes core/v1.Affinity
 </td>
 <td>
 <em>(Optional)</em>
-<p>Affinity of TiDB cluster Pods</p>
+<p>Affinity of TiDB cluster Pods.
+Will be overwritten by each cluster component&rsquo;s specific affinity setting, e.g. <code>spec.tidb.affinity</code></p>
 </td>
 </tr>
 <tr>
@@ -1151,8 +1151,7 @@ Optional: Defaults to UTC</p>
 </em>
 </td>
 <td>
-<p>Services list non-headless services type used in TidbCluster
-Deprecated</p>
+<p>(Deprecated) Services list non-headless services type used in TidbCluster</p>
 </td>
 </tr>
 <tr>
@@ -1164,7 +1163,7 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>EnableDynamicConfiguration indicates whether DynamicConfiguration is enabled for the tidbcluster</p>
+<p>EnableDynamicConfiguration indicates whether to append <code>--advertise-status-addr</code> to the startup parameters of TiKV.</p>
 </td>
 </tr>
 <tr>
@@ -3073,8 +3072,8 @@ string
 </em>
 </td>
 <td>
-<p>Image of the component, override baseImage and version if present
-Deprecated</p>
+<p>(Deprecated) Image of the component
+Use <code>baseImage</code> and <code>version</code> instead</p>
 </td>
 </tr>
 <tr>
@@ -3143,7 +3142,7 @@ Kubernetes core/v1.Affinity
 </td>
 <td>
 <em>(Optional)</em>
-<p>Affinity of the component. Override the cluster-level one if present
+<p>Affinity of the component. Override the cluster-level setting if present.
 Optional: Defaults to cluster-level setting</p>
 </td>
 </tr>
@@ -3254,10 +3253,8 @@ Optional: Defaults to cluster-level setting</p>
 </td>
 <td>
 <em>(Optional)</em>
-<p>List of environment variables to set in the container, like
-v1.Container.Env.
-Note that following env names cannot be used and may be overrided by
-tidb-operator built envs.
+<p>List of environment variables to set in the container, like v1.Container.Env.
+Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs
 - NAMESPACE
 - TZ
 - SERVICE_NAME
@@ -7260,8 +7257,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting introduced
-Base image of the component, image tag is now allowed during validation</p>
+<p>Base image of the component, image tag is now allowed during validation</p>
 </td>
 </tr>
 <tr>
@@ -7307,6 +7303,20 @@ Defaults to Kubernetes default storage class.</p>
 </tr>
 <tr>
 <td>
+<code>storageVolumes</code></br>
+<em>
+<a href="#storagevolume">
+[]StorageVolume
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>StorageVolumes configure additional storage for PD pods.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>dataSubDir</code></br>
 <em>
 string
@@ -7360,7 +7370,8 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>EnableDashboardInternalProxy would directly set <code>internal-proxy</code> in the <code>PdConfig</code></p>
+<p>(Deprecated) EnableDashboardInternalProxy would directly set <code>internal-proxy</code> in the <code>PdConfig</code>.
+Note that this is deprecated, we should just set <code>dashboard.internal-proxy</code> in <code>pd.config</code>.</p>
 </td>
 </tr>
 <tr>
@@ -7375,21 +7386,6 @@ bool
 <p>MountClusterClientSecret indicates whether to mount <code>cluster-client-secret</code> to the Pod</p>
 </td>
 </tr>
-<tr>
-<td>
-<code>storageVolumes</code></br>
-<em>
-<a href="#storagevolume">
-[]StorageVolume
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>StorageVolumes is additional storage apply for PD node.
-Default to storageClassName storage class</p>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="pdstatus">PDStatus</h3>
@@ -8466,8 +8462,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting introduced
-Base image of the component, image tag is now allowed during validation</p>
+<p>Base image of the component, image tag is now allowed during validation</p>
 </td>
 </tr>
 <tr>
@@ -8492,8 +8487,7 @@ github.com/pingcap/tidb-operator/pkg/util/config.GenericConfig
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: add schema
-The configuration of Pump cluster.</p>
+<p>The configuration of Pump cluster.</p>
 </td>
 </tr>
 <tr>
@@ -9297,8 +9291,7 @@ string
 <a href="#tidbclusterspec">TidbClusterSpec</a>)
 </p>
 <p>
-<p>Deprecated
-Service represent service type used in TidbCluster</p>
+<p>(Deprecated) Service represent service type used in TidbCluster</p>
 </p>
 <table>
 <thead>
@@ -9425,7 +9418,7 @@ string
 If specified and supported by the platform, this will restrict traffic through the cloud-provider
 load-balancer will be restricted to the specified client IPs. This field will be ignored if the
 cloud-provider does not support the feature.&rdquo;
-More info: <a href="https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/">https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/</a>
+More info: <a href="https://kubernetes.io/docs/concepts/services-networking/service/#aws-nlb-support">https://kubernetes.io/docs/concepts/services-networking/service/#aws-nlb-support</a>
 Optional: Defaults to omitted</p>
 </td>
 </tr>
@@ -9777,7 +9770,8 @@ LocalStorageProvider
 <a href="#tikvspec">TiKVSpec</a>)
 </p>
 <p>
-<p>StorageVolume is TiKV storage information</p>
+<p>StorageVolume configures additional storage for PD/TiDB/TiKV pods.
+If <code>StorageClassName</code> not set, default to the <code>spec.[pd|tidb|tikv].storageClassName</code></p>
 </p>
 <table>
 <thead>
@@ -9835,7 +9829,7 @@ string
 <a href="#tidbclusterspec">TidbClusterSpec</a>)
 </p>
 <p>
-<p>TLSCluster can enable TLS connection between TiDB server components
+<p>TLSCluster can enable mutual TLS connection between TiDB cluster components
 <a href="https://pingcap.com/docs/stable/how-to/secure/enable-tls-between-components/">https://pingcap.com/docs/stable/how-to/secure/enable-tls-between-components/</a></p>
 </p>
 <table>
@@ -9855,11 +9849,11 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>Enable mutual TLS authentication among TiDB components
+<p>Enable mutual TLS connection between TiDB cluster components
 Once enabled, the mutual authentication applies to all components,
 and it does not support applying to only part of the components.
 The steps to enable this feature:
-1. Generate TiDB server components certificates and a client-side certifiacete for them.
+1. Generate TiDB cluster components certificates and a client-side certifiacete for them.
 There are multiple ways to generate these certificates:
 - user-provided certificates: <a href="https://pingcap.com/docs/stable/how-to/secure/generate-self-signed-certificates/">https://pingcap.com/docs/stable/how-to/secure/generate-self-signed-certificates/</a>
 - use the K8s built-in certificate signing system signed certificates: <a href="https://kubernetes.io/docs/tasks/tls/managing-tls-in-a-cluster/">https://kubernetes.io/docs/tasks/tls/managing-tls-in-a-cluster/</a>
@@ -10798,6 +10792,7 @@ map[string]string
 <a href="#tidbspec">TiDBSpec</a>)
 </p>
 <p>
+<p>TiDBConfigWraper simply wrapps a GenericConfig</p>
 </p>
 <table>
 <thead>
@@ -10961,6 +10956,7 @@ So do not use this before v4.0.9.</p>
 <a href="#tidbspec">TiDBSpec</a>)
 </p>
 <p>
+<p>TiDBServiceSpec defines <code>.tidb.service</code> field of <code>TidbCluster.spec</code>.</p>
 </p>
 <table>
 <thead>
@@ -11092,8 +11088,8 @@ string
 </em>
 </td>
 <td>
-<p>Image used for slowlog tailer
-Deprecated, use TidbCluster.HelperImage instead</p>
+<p>(Deprecated) Image used for slowlog tailer.
+Use <code>spec.helper.image</code> instead</p>
 </td>
 </tr>
 <tr>
@@ -11106,8 +11102,8 @@ Kubernetes core/v1.PullPolicy
 </em>
 </td>
 <td>
-<p>ImagePullPolicy of the component. Override the cluster-level imagePullPolicy if present
-Deprecated, use TidbCluster.HelperImagePullPolicy instead</p>
+<p>(Deprecated) ImagePullPolicy of the component. Override the cluster-level imagePullPolicy if present
+Use <code>spec.helper.imagePullPolicy</code> instead</p>
 </td>
 </tr>
 </tbody>
@@ -11189,8 +11185,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting introduced
-Base image of the component, image tag is now allowed during validation</p>
+<p>Base image of the component, image tag is now allowed during validation</p>
 </td>
 </tr>
 <tr>
@@ -11249,31 +11244,31 @@ Optional: Defaults to true</p>
 </tr>
 <tr>
 <td>
-<code>tlsClient</code></br>
+<code>slowLogTailer</code></br>
 <em>
-<a href="#tidbtlsclient">
-TiDBTLSClient
+<a href="#tidbslowlogtailerspec">
+TiDBSlowLogTailerSpec
 </a>
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>Whether enable the TLS connection between the SQL client and TiDB server
-Optional: Defaults to nil</p>
+<p>The specification of the slow log tailer sidecar</p>
 </td>
 </tr>
 <tr>
 <td>
-<code>slowLogTailer</code></br>
+<code>tlsClient</code></br>
 <em>
-<a href="#tidbslowlogtailerspec">
-TiDBSlowLogTailerSpec
+<a href="#tidbtlsclient">
+TiDBTLSClient
 </a>
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>The spec of the slow log tailer sidecar</p>
+<p>Whether enable the TLS connection between the SQL client and TiDB server
+Optional: Defaults to nil</p>
 </td>
 </tr>
 <tr>
@@ -11329,8 +11324,7 @@ until the action is complete, unless the container process fails, in which case
 </td>
 <td>
 <em>(Optional)</em>
-<p>StorageVolumes is additional storage apply for TiDB node.
-Default to storageClassName storage class</p>
+<p>StorageVolumes configure additional storage for TiDB pods.</p>
 </td>
 </tr>
 <tr>
@@ -15633,8 +15627,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting introduced
-Base image of the component, image tag is now allowed during validation</p>
+<p>Base image of the component, image tag is now allowed during validation</p>
 </td>
 </tr>
 <tr>
@@ -15719,7 +15712,7 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>RecoverFailover indicates that Operator can recover the failover Pods</p>
+<p>RecoverFailover indicates that Operator can recover the failed Pods</p>
 </td>
 </tr>
 <tr>
@@ -15758,8 +15751,7 @@ Defaults to 3m</p>
 </td>
 <td>
 <em>(Optional)</em>
-<p>StorageVolumes is additional storage apply for TiKV node.
-Default to storageClassName storage class</p>
+<p>StorageVolumes configure additional storage for TiKV pods.</p>
 </td>
 </tr>
 </tbody>
@@ -16996,8 +16988,7 @@ string
 </td>
 <td>
 <em>(Optional)</em>
-<p>TODO: remove optional after defaulting logic introduced
-TiDB cluster version</p>
+<p>TiDB cluster version</p>
 </td>
 </tr>
 <tr>
@@ -17120,7 +17111,8 @@ Kubernetes core/v1.Affinity
 </td>
 <td>
 <em>(Optional)</em>
-<p>Affinity of TiDB cluster Pods</p>
+<p>Affinity of TiDB cluster Pods.
+Will be overwritten by each cluster component&rsquo;s specific affinity setting, e.g. <code>spec.tidb.affinity</code></p>
 </td>
 </tr>
 <tr>
@@ -17197,8 +17189,7 @@ Optional: Defaults to UTC</p>
 </em>
 </td>
 <td>
-<p>Services list non-headless services type used in TidbCluster
-Deprecated</p>
+<p>(Deprecated) Services list non-headless services type used in TidbCluster</p>
 </td>
 </tr>
 <tr>
@@ -17210,7 +17201,7 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>EnableDynamicConfiguration indicates whether DynamicConfiguration is enabled for the tidbcluster</p>
+<p>EnableDynamicConfiguration indicates whether to append <code>--advertise-status-addr</code> to the startup parameters of TiKV.</p>
 </td>
 </tr>
 <tr>
diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
index c548ceaf7e2..ef031ceedfd 100644
--- a/examples/advanced/tidb-cluster.yaml
+++ b/examples/advanced/tidb-cluster.yaml
@@ -1,189 +1,674 @@
 apiVersion: pingcap.com/v1alpha1
 kind: TidbCluster
 metadata:
-  name: detailed-tidb
+  name: advanced-tidb
   namespace: default
 
 spec:
-  # ** Basic Configuration **
-  # TiDB cluster version
+  #######################
+  # Basic Configuration #
+  #######################
+
+  ## TiDB cluster version
   version: "v4.0.8"
 
-  # Time zone of TiDB cluster Pods
+  ## Time zone of TiDB cluster Pods
   timezone: UTC
 
-  # ConfigUpdateStrategy determines how the configuration change is applied to the cluster.
-  # UpdateStrategyInPlace will update the ConfigMap of configuration in-place and an extra rolling-update of the
-  # cluster component is needed to reload the configuration change.
-  # UpdateStrategyRollingUpdate will create a new ConfigMap with the new configuration and rolling-update the
-  # related components to use the new ConfigMap, that is, the new configuration will be applied automatically.
-  # support InPlace and RollingUpdate
-  configUpdateStrategy: RollingUpdate
+  ## serviceAccount specifies the service account for PD/TiDB/TiKV/TiFlash/Pump/TiCDC components in this TidbCluster
+  # serviceAccount: advanced-tidb
 
-  # Host networking requested for this pod. Use the host's network namespace
-  hostNetwork: false
+  ## ConfigUpdateStrategy determines how the configuration change is applied to the cluster.
+  ## Valid values are `InPlace` and `RollingUpdate`
+  ##   UpdateStrategy `InPlace` will update the ConfigMap of configuration in-place and an extra rolling update of the
+  ##   cluster component is needed to reload the configuration change.
+  ##   UpdateStrategy `RollingUpdate` will create a new ConfigMap with the new configuration and rolling update the
+  ##   related components to use the new ConfigMap, that is, the new configuration will be applied automatically.
+  configUpdateStrategy: RollingUpdate
 
-  # ImagePullPolicy of TiDB cluster Pods
+  ## ImagePullPolicy of TiDB cluster Pods
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/overview/#container-images
   imagePullPolicy: IfNotPresent
 
-  # Image used to tail slow log and set kernel parameters if necessary, must have `tail` and `sysctl` installed
+  ## If private registry is used, imagePullSecrets may be set
+  ## You can also set this in service account
+  ## Ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+  # imagePullSecrets: secretName
+
+  ## Image used to do miscellaneous tasks as sidecar container, such as:
+  ## - execute sysctls when PodSecurityContext is set for some components, requires `sysctl` installed
+  ## - tail slow log for tidb, requires `tail` installed
+  ## - fill tiflash config template file based on pod ordinal
   # helper:
-  #   image: busybox:1.31.1
+  #   image: busybox:latest
+  #   imagePullPolicy: IfNotPresent
+
+  ## Enable PVC/PV reclaim for orphan PVC/PV left by statefulset scale-in.
+  ## When set to `true`, PVC/PV that are not used by any tidb cluster pods will be deleted automatically.
+  enablePVReclaim: false
+
+  ## Persistent volume reclaim policy applied to the PV consumed by the TiDB cluster, default to `Retain`.
+  ## Note that the reclaim policy Recycle may not be supported by some storage types, e.g. local.
+  ## Ref: https://kubernetes.io/docs/tasks/administer-cluster/change-pv-reclaim-policy/
+  pvReclaimPolicy: Retain
+
+  ##########################
+  # Advanced Configuration #
+  ##########################
+
+  ## when deploying a heterogeneous TiDB cluster, you MUST specify the cluster name to join here
+  # cluster:
+  #   namespace: default
+  #   name: tidb-cluster-to-join
+  #   clusterDomain: cluster.local
+
+  ## specifying pdAddresses will make PD in this TiDB cluster to join another existing PD cluster
+  ## PD will then start with arguments --join= instead of --initial-cluster=
+  # pdAddresses:
+  #   - http://cluster1-pd-0.cluster1-pd-peer.default.svc:2379
+  #   - http://cluster1-pd-1.cluster1-pd-peer.default.svc:2379
+
+  ## Enable mutual TLS connection between TiDB cluster components
+  ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/enable-tls-between-components/
+  # tlsCluster:
+  #   enabled: true
+
+  ## Annotations of TiDB cluster pods, will be merged with component annotation settings.
+  # annotations:
+  #   node.kubernetes.io/instance-type: some-vm-type
+  #   topology.kubernetes.io/region: some-region
+
+  ## NodeSelector of TiDB cluster pods, will be merged with component nodeSelector settings.
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  # nodeSelector:
+  #   node-role.kubernetes.io/tidb: true
 
-  # Enable the dynamic configuration feature
+  ## Tolerations are applied to TiDB cluster pods, allowing (but do not require) pods to be scheduled onto nodes with matching taints.
+  ## This cluster-level `tolerations` only takes effect when no component-level `tolerations` are set.
+  ## e.g. if `pd.tolerations` is not empty, `tolerations` here will be ignored.
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  # tolerations:
+  #   - effect: NoSchedule
+  #     key: dedicated
+  #     operator: Equal
+  #     value: tidb
+
+  ## Use the node network namespace, default to false
+  ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#host-namespaces
+  hostNetwork: false
+
+  ## specify resource requirements for discovery deployment
+  # discovery:
+  #   requests:
+  #     cpu: 1000m
+  #     memory: 256Mi
+  #   limits:
+  #     cpu: 2000m
+  #     memory: 1Gi
+
+  ## if true, this tidb cluster is paused and will not be synced by the controller
+  # paused: false
+
+  ## SchedulerName of TiDB cluster pods.
+  ## If specified, the pods will be scheduled by the specified scheduler.
+  ## Can be overwritten by component settings.
+  # schedulerName: tidb-scheduler
+
+  ## Affinity for pod scheduling, will be overwritten by each cluster component's specific affinity setting
+  ## Can refer to PD/TiDB/TiKV affinity settings, and ensure only cluster-scope general settings here
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  # affinity: {}
+
+  ## Specify pod priorities of pods in TidbCluster, default to empty.
+  ## Can be overwritten by component settings.
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
+  # priorityClassName: system-cluster-critical
+
+  ## If set to `true`, `--advertise-status-addr` will be appended to the startup parameters of TiKV
   enableDynamicConfiguration: true
 
+  ## Set update strategy of StatefulSet, can be overwritten by the setting of each component.
+  ## defaults to RollingUpdate
+  ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+  # statefulSetUpdateStrategy: RollingUpdate
+
+  ## The identifier of the Pod will be `$(podName).$(serviceName).$(namespace).svc.$(clusterDomain)` when `clusterDomain` is set.
+  ## Set this in the case where a TiDB cluster is deployed across multiple Kubernetes clusters. default to empty.
+  # clusterDomain: cluster.local
+
+  ###########################
+  # TiDB Cluster Components #
+  ###########################
+
   pd:
-    # Base image of the component
+    ##########################
+    # Basic PD Configuration #
+    ##########################
+
+    ## Base image of the component
     baseImage: pingcap/pd
 
-    # PD Configuration
-    # Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/configure-cluster-using-tidbcluster/#configure-pd-parameters
-    config: {}
+    ## pd-server configuration
+    ## Ref: https://docs.pingcap.com/tidb/stable/pd-configuration-file
+    config: |
+      lease = 3
+      enable-prevote = true
 
-    # The desired ready replicas
+    ## The desired replicas
     replicas: 3
 
-    # describes the compute resource requirements.
-    # Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-    requests:
-      cpu: "100m"
-      storage: 1Gi
-
-    # TiDB Operator will automatically mount the certificates
-    # Defaults to "false"
-    # Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/configure-a-tidb-cluster#mountclusterclientsecret
-    mountClusterClientSecret: false
-    
+    ## max inprogress failover PD pod counts
+    # maxFailoverCount: 3
+
+    ## describes the compute resource requirements and limits.
+    ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+    # requests:
+    #   cpu: 1000m
+    #   memory: 1Gi
+    #   storage: 1Gi
+    # limits:
+    #   cpu: 2000m
+    #   memory: 2Gi
+
+    ## defines Kubernetes service for pd-server
+    ## Ref: https://kubernetes.io/docs/concepts/services-networking/service/
+    # service:
+    #   type: ClusterIP
+    #   annotations:
+    #     foo: bar
+    #   portName: client
+
+    #############################
+    # Advanced PD Configuration #
+    #############################
+
+    ## The following block overwrites TiDB cluster-level configurations in `spec`
+    # version: "v4.0.8"
+    # imagePullPolicy: IfNotPresent
+    # imagePullSecrets: secretName
+    # hostNetwork: false
+    # serviceAccount: advanced-tidb-pd
+    # priorityClassName: system-cluster-critical
+    # schedulerName: tidb-scheduler
+    # nodeSelector:
+    #   app.kubernetes.io/component: pd
+    # annotations:
+    #   node.kubernetes.io/instance-type: some-vm-type
+    # tolerations:
+    #   - effect: NoSchedule
+    #     key: dedicated
+    #     operator: Equal
+    #     value: pd
+    # configUpdateStrategy: RollingUpdate
+    # statefulSetUpdateStrategy: RollingUpdate
+
+    ## List of environment variables to set in the container
+    ## Note that the following env names cannot be used and will be overwritten by TiDB Operator builtin envs
+    ##   - NAMESPACE
+    ##   - TZ
+    ##   - SERVICE_NAME
+    ##   - PEER_SERVICE_NAME
+    ##   - HEADLESS_SERVICE_NAME
+    ##   - SET_NAME
+    ##   - HOSTNAME
+    ##   - CLUSTER_NAME
+    ##   - POD_NAME
+    ##   - BINLOG_ENABLED
+    ##   - SLOW_LOG_FILE
+    ## Ref: https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/
+    # env:
+    # - name: MY_ENV_1
+    #   value: value1
+    # - name: MY_ENV_2
+    #   valueFrom:
+    #     fieldRef:
+    #       fieldPath: status.myEnv2
+
+    ## Custom sidecar containers can be injected into the PD pods,
+    ## which can act as a logging/tracing agent or for any other use case
+    # additionalContainers:
+    # - name: myCustomContainer
+    #   image: ubuntu
+
+    ## custom additional volumes in PD pods
+    # additionalVolumes:
+    # # specify volume types that are supported by Kubernetes, Ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes
+    # - name: nfs
+    #   nfs:
+    #     server: 192.168.0.2
+    #     path: /nfs
+
+    ## custom additional volume mounts in PD pods
+    # additionalVolumeMounts:
+    # # this must match `name` in `additionalVolumes`
+    # - name: nfs
+    #   mountPath: /nfs
+
+    ## Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request.
+    ## Ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution
+    # terminationGracePeriodSeconds: 30s
+
+    ## PodSecurityContext holds pod-level security attributes and common container settings.
+    ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+    # podSecurityContext:
+    #   sysctls:
+    #   - name: net.core.somaxconn
+    #     value: "32768"
+
+    ## when TLS cluster feature is enabled, TiDB Operator will automatically mount the cluster client certificates if mountClusterClientSecret is set to true
+    ## Defaults to false
+    ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/configure-a-tidb-cluster#mountclusterclientsecret
+    mountClusterClientSecret: true
+
     ## The storageClassName of the persistent volume for PD data storage.
-    ## Defaults to Kubernetes default storage class.
     # storageClassName: ""
 
+    ## defines additional volumes for which PVCs will be created by StatefulSet controller
+    # storageVolumes:
+    #   # this will be suffix of PVC names in VolumeClaimTemplates of PD StatefulSet
+    # - name: volumeName
+    #   # specify this to use special storageClass for this volume, default to component-level `storageClassName`
+    #   storageClassName: local-storage
+    #   # storage request of PVC
+    #   storageSize: 1Gi
+    #   # mount path of the PVC
+    #   mountPath: /some/path
+
     ## Subdirectory within the volume to store PD Data. By default, the data
     ## is stored in the root directory of volume which is mounted at
-    ## /var/lib/pd.
-    ## Specifying this will change the data directory to a subdirectory, e.g.
-    ## /var/lib/pd/data if you set the value to "data".
+    ## /var/lib/pd. Specifying this will change the data directory to a subdirectory,
+    ## e.g. /var/lib/pd/data if you set the value to "data".
     ## It's dangerous to change this value for a running cluster as it will
     ## upgrade your cluster to use a new storage directory.
     ## Defaults to "" (volume's root).
     # dataSubDir: ""
 
-    ## Affinity for pod assignment
+    ## Affinity for pod scheduling
     ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
     # affinity:
     #   podAntiAffinity:
+    #     # prefer not to run pd pods on the same node which runs tidb/tikv pods
     #     preferredDuringSchedulingIgnoredDuringExecution:
-    #       - podAffinityTerm:
-    #           labelSelector:
-    #             matchExpressions:
-    #               - key: app.kubernetes.io/component
-    #                 operator: In
-    #                 values:
-    #                   - tidb
-    #                   - tikv
-    #           topologyKey: ""
-    #         weight: 100
-    ## If you use require affinity, you must ensure that at least 3 nodes are available in the cluster
-    #     requiredDuringSchedulingIgnoredDuringExecution:
-    #       - labelSelector:
+    #     - podAffinityTerm:
+    #         labelSelector:
     #           matchExpressions:
-    #             - key: app.kubernetes.io/component
-    #               operator: In
-    #               values:
-    #                 - pd
-    #         topologyKey: ""
-    
-    ## Specify node labels for pods assignment
-    ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-    # nodeSelector:
-    #   app.kubernetes.io/component: pd
+    #           - key: app.kubernetes.io/component
+    #             operator: In
+    #             values:
+    #             - tidb
+    #             - tikv
+    #         topologyKey: kubernetes.io/hostname
+    #       weight: 100
+    #     # require not to run PD pods on nodes where there's already a PD pod running
+    #     # if setting this, you must ensure that at least `replicas` nodes are available in the cluster
+    #     requiredDuringSchedulingIgnoredDuringExecution:
+    #     - labelSelector:
+    #         matchExpressions:
+    #         - key: app.kubernetes.io/component
+    #           operator: In
+    #           values:
+    #           - pd
+    #       topologyKey: kubernetes.io/hostname
+
+    ## set a different tidb client TLS cert secret name for TiDB Dashboard than the default ${clusterName}-tidb-client-secret
+    ## only useful when TLS is enabled for TiDB server
+    ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/enable-tls-for-mysql-client
+    # tlsClientSecretName: custom-tidb-client-secret-name
 
   tidb:
-    # Base image of the component
-    baseImage: pingcap/tidb
+    ############################
+    # Basic TiDB Configuration #
+    ############################
 
-    # The desired ready replicas
-    replicas: 3
+    ## Base image of the component
+    baseImage: pingcap/tidb
 
-    # describes the compute resource requirements.
-    # Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-    requests:
-      cpu: "100m"
+    ## tidb-server Configuration
+    ## Ref: https://docs.pingcap.com/tidb/stable/tidb-configuration-file
+    config: |
+      level = info
+      enable-timestamp = true
 
-    # TiDB Configuration
-    # https://pingcap.com/docs/tidb-in-kubernetes/stable/configure-cluster-using-tidbcluster/#configure-tidb-parameters
-    config: {}
+    ## The desired replicas
+    replicas: 3
 
-    ## Service defines a Kubernetes service of TiDB cluster.
-    ## If you are in a public cloud environment, you can use cloud LB to access the TiDB service
-    ## if you are in a private cloud environment, you can use ingress
-    ## you can set mysqlNodePort and statusNodePort to expose server/status service to given NodePort
-    # service:
-    #   externalTrafficPolicy: Local
-    #   type: LoadBalancer
-    #   mysqlNodePort: 30020
-    #   statusNodePort: 30040
+    ## max inprogress failover TiDB pod counts
+    # maxFailoverCount: 3
+
+    ## describes the compute resource requirements.
+    ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+    # requests:
+    #   cpu: 1000m
+    #   memory: 1Gi
+    # limits:
+    #   cpu: 2000m
+    #   memory: 2Gi
+
+    ## defines Kubernetes service for tidb-server
+    ## If you are in a public cloud environment, you can use cloud LoadBalancer to access the TiDB service
+    ## if you are in a private cloud environment, you can use Ingress or NodePort, or ClusterIP and port forward (only for development/test)
+    ## you can set mysqlNodePort and statusNodePort to expose server/status service to the given NodePort
+    service:
+      type: NodePort
+      # Ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
+      externalTrafficPolicy: Local
+      # # which NodePort to expose 4000 (mysql) port of tidb-server, only effective when type=LoadBalancer/NodePort
+      # mysqlNodePort: 30020
+      # # whether to export the status port, defaults to true
+      # exposeStatus: true
+      # # which NodePort to expose 10080 (status) port of tidb-server, only effective when type=LoadBalancer/NodePort and exposeStatus=true
+      # statusNodePort: 30040
+
+    ###############################
+    # Advanced TiDB Configuration #
+    ###############################
+
+    ## The following block overwrites TiDB cluster-level configurations in `spec`
+    # version: "v4.0.8"
+    # imagePullPolicy: IfNotPresent
+    # imagePullSecrets: secretName
+    # hostNetwork: false
+    # serviceAccount: advanced-tidb-tidb
+    # priorityClassName: system-cluster-critical
+    # schedulerName: tidb-scheduler
+    # nodeSelector:
+    #   app.kubernetes.io/component: tidb
+    # annotations:
+    #   node.kubernetes.io/instance-type: some-vm-type
+    # tolerations:
+    #   - effect: NoSchedule
+    #     key: dedicated
+    #     operator: Equal
+    #     value: tidb
+    # configUpdateStrategy: RollingUpdate
+    # statefulSetUpdateStrategy: RollingUpdate
+
+    ## List of environment variables to set in the container
+    ## Note that the following env names cannot be used and will be overwritten by TiDB Operator builtin envs
+    ##   - NAMESPACE
+    ##   - TZ
+    ##   - SERVICE_NAME
+    ##   - PEER_SERVICE_NAME
+    ##   - HEADLESS_SERVICE_NAME
+    ##   - SET_NAME
+    ##   - HOSTNAME
+    ##   - CLUSTER_NAME
+    ##   - POD_NAME
+    ##   - BINLOG_ENABLED
+    ##   - SLOW_LOG_FILE
+    ## Ref: https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/
+    # env:
+    # - name: MY_ENV_1
+    #   value: value1
+    # - name: MY_ENV_2
+    #   valueFrom:
+    #     fieldRef:
+    #       fieldPath: status.myEnv2
+
+    ## Custom sidecar containers can be injected into the TiDB pods,
+    ## which can act as a logging/tracing agent or for any other use case
+    # additionalContainers:
+    # - name: myCustomContainer
+    #   image: ubuntu
+
+    ## custom additional volumes in TiDB pods
+    # additionalVolumes:
+    # # specify volume types that are supported by Kubernetes, Ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes
+    # - name: nfs
+    #   nfs:
+    #     server: 192.168.0.2
+    #     path: /nfs
+
+    ## custom additional volume mounts in TiDB pods
+    # additionalVolumeMounts:
+    # # this must match `name` in `additionalVolumes`
+    # - name: nfs
+    #   mountPath: /nfs
+
+    ## Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request.
+    ## Ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution
+    # terminationGracePeriodSeconds: 30s
+
+    ## PodSecurityContext holds pod-level security attributes and common container settings.
+    ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+    # podSecurityContext:
+    #   sysctls:
+    #   - name: net.ipv4.tcp_keepalive_time
+    #     value: "300"
+    #   - name: net.ipv4.tcp_keepalive_intvl
+    #     value: "75"
+    #   - name: net.core.somaxconn
+    #     value: "32768"
+
+    ## prob tidb-server readiness
+    ## valid type values:
+    ##   - `tcp`, which uses Kubernetes TCPSocketAction to prob the 4000 tcp port of the pod
+    ##   - `command`, which uses curl to access the /status path on port 10080 of the pod
+    ## This is supported from TiDB Operator v1.1.7
+    # readinessProbe:
+    #   # The `command` type is only supported after tidb v4.0.9, ref: https://github.com/pingcap/tidb/pull/20694
+    #   type: command
+
+    ## when enabled, TiDB will accept TLS encrypted connections from MySQL client
+    ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/enable-tls-for-mysql-client
+    # tlsClient:
+    #   enabled: true
+
+    ## binlogEnabled will automatically be true if Pump is enabled, otherwise false
+    ## set this manually only if you really know what you are doing
+    ## MANUAL CONFIG NOT RECOMMENDED
+    # binlogEnabled: false
+
+    ## if enabled, the slow log will be shown in a separate sidecar container
+    # separateSlowLog: true
+    # # configures separate sidecar container, where `image` & `imagePullPolicy` will be overwritten by
+    # # the same field in `TidbCluster.helper`
+    # slowLogTailer:
+    #   requests:
+    #     cpu: 1000m
+    #     memory: 1Gi
+    #   limits:
+    #     cpu: 2000m
+    #     memory: 2Gi
+    #   image: busybox
+    #   imagePullPolicy: IfNotPresent
+
+    ## The storageClassName of the persistent volume for TiDB data storage.
+    # storageClassName: ""
 
-    ## Affinity for pod assignment
+    ## defines additional volumes for which PVCs will be created by StatefulSet controller
+    # storageVolumes:
+    #   # this will be suffix of PVC names in VolumeClaimTemplates of TiDB StatefulSet
+    # - name: volumeName
+    #   # specify this to use special storageClass for this volume, default to component-level `storageClassName`
+    #   storageClassName: local-storage
+    #   # storage request of PVC
+    #   storageSize: 1Gi
+    #   # mount path of the PVC
+    #   mountPath: /some/path
+
+    ## config Kubernetes container lifecycle hooks for tidb-server pods
+    ## Ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
+    # lifecycle:
+    #   postStart:
+    #     exec:
+    #       command:
+    #       - echo
+    #       - "postStart"
+    #   preStop:
+    #     exec:
+    #       command:
+    #       - echo
+    #       - "preStop"
+
+    ## Affinity for pod scheduling
     ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
     # affinity:
     #   podAntiAffinity:
     #     preferredDuringSchedulingIgnoredDuringExecution:
-    #       - podAffinityTerm:
-    #           labelSelector:
-    #             matchExpressions:
-    #               - key: app.kubernetes.io/component
-    #                 operator: In
-    #                 values:
-    #                   - pd
-    #                   - tikv
-    #           topologyKey: ""
-    #         weight: 100
-    ## If you use require affinity, you must ensure that at least 3 nodes are available in the cluster
-    #     requiredDuringSchedulingIgnoredDuringExecution:
-    #       - labelSelector:
+    #     - podAffinityTerm:
+    #         labelSelector:
     #           matchExpressions:
-    #             - key: app.kubernetes.io/component
-    #               operator: In
-    #               values:
-    #                 - tidb
-    #         topologyKey: ""
-
-    ## Specify node labels for pods assignment
-    ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-    # nodeSelector:
-    #   app.kubernetes.io/component: tidb
+    #           - key: app.kubernetes.io/component
+    #             operator: In
+    #             values:
+    #             - pd
+    #             - tikv
+    #         topologyKey: kubernetes.io/hostname
+    #       weight: 100
+    #     # require not to run TiDB pods on nodes where there's already a TiDB pod running
+    #     # if setting this, you must ensure that at least `replicas` nodes are available in the cluster
+    #     requiredDuringSchedulingIgnoredDuringExecution:
+    #     - labelSelector:
+    #         matchExpressions:
+    #         - key: app.kubernetes.io/component
+    #           operator: In
+    #           values:
+    #           - tidb
+    #       topologyKey: kubernetes.io/hostname
 
   tikv:
-    # Base image of the component
+    ############################
+    # Basic TiKV Configuration #
+    ############################
+
+    ## Base image of the component
     baseImage: pingcap/tikv
 
-    # TiKV Configuration
-    # https://pingcap.com/docs/tidb-in-kubernetes/stable/configure-cluster-using-tidbcluster/#configure-tikv-parameters
-    config: {}
+    ## tikv-server configuration
+    ## Ref: https://docs.pingcap.com/tidb/stable/tikv-configuration-file
+    config: |
+      prevote = true
 
-    # The desired ready replicas
+    ## The desired replicas
     replicas: 3
 
-    # describes the compute resource requirements.
-    # Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-    requests:
-      cpu: "100m"
-      storage: 1Gi
-
-    # TiDB Operator will automatically mount the certificates
-    # Defaults to "false"
-    # Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/configure-a-tidb-cluster#mountclusterclientsecret
-    mountClusterClientSecret: false
-    
+    ## max inprogress failover TiKV pod counts
+    # maxFailoverCount: 3
+
+    ## describes the compute resource requirements.
+    ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+    # requests:
+    #   cpu: 1000m
+    #   memory: 1Gi
+    #   storage: 1Gi
+    # limits:
+    #   cpu: 2000m
+    #   memory: 2Gi
+    #   # settings `storage` here will add `--capacity` arg to tikv-server
+    #   storage: 10Gi
+
+    ###############################
+    # Advanced TiKV Configuration #
+    ###############################
+
+    ## The following block overwrites TiDB cluster-level configurations in `spec`
+    # version: "v4.0.8"
+    # imagePullPolicy: IfNotPresent
+    # imagePullSecrets: secretName
+    # hostNetwork: false
+    # serviceAccount: advanced-tidb-tikv
+    # priorityClassName: system-cluster-critical
+    # schedulerName: tidb-scheduler
+    # nodeSelector:
+    #   app.kubernetes.io/component: tikv
+    # annotations:
+    #   node.kubernetes.io/instance-type: some-vm-type
+    # tolerations:
+    #   - effect: NoSchedule
+    #     key: dedicated
+    #     operator: Equal
+    #     value: tikv
+    # configUpdateStrategy: RollingUpdate
+    # statefulSetUpdateStrategy: RollingUpdate
+
+    ## List of environment variables to set in the container
+    ## Note that the following env names cannot be used and will be overwritten by TiDB Operator builtin envs
+    ##   - NAMESPACE
+    ##   - TZ
+    ##   - SERVICE_NAME
+    ##   - PEER_SERVICE_NAME
+    ##   - HEADLESS_SERVICE_NAME
+    ##   - SET_NAME
+    ##   - HOSTNAME
+    ##   - CLUSTER_NAME
+    ##   - POD_NAME
+    ##   - BINLOG_ENABLED
+    ##   - SLOW_LOG_FILE
+    ## Ref: https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/
+    # env:
+    # - name: MY_ENV_1
+    #   value: value1
+    # - name: MY_ENV_2
+    #   valueFrom:
+    #     fieldRef:
+    #       fieldPath: status.myEnv2
+
+    ## Custom sidecar containers can be injected into the TiKV pods,
+    ## which can act as a logging/tracing agent or for any other use case
+    # additionalContainers:
+    # - name: myCustomContainer
+    #   image: ubuntu
+
+    ## custom additional volumes in TiKV pods
+    # additionalVolumes:
+    # # specify volume types that are supported by Kubernetes, Ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes
+    # - name: nfs
+    #   nfs:
+    #     server: 192.168.0.2
+    #     path: /nfs
+
+    ## custom additional volume mounts in TiKV pods
+    # additionalVolumeMounts:
+    # # this must match `name` in `additionalVolumes`
+    # - name: nfs
+    #   mountPath: /nfs
+
+    ## Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request.
+    ## Ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution
+    # terminationGracePeriodSeconds: 30s
+
+    ## PodSecurityContext holds pod-level security attributes and common container settings.
+    ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+    # podSecurityContext:
+    #   sysctls:
+    #   - name: net.ipv4.tcp_keepalive_time
+    #     value: "300"
+    #   - name: net.ipv4.tcp_keepalive_intvl
+    #     value: "75"
+    #   - name: net.core.somaxconn
+    #     value: "32768"
+
+    ## when TLS cluster feature is enabled, TiDB Operator will automatically mount the cluster client certificates if mountClusterClientSecret is set to true
+    ## Defaults to false
+    ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/configure-a-tidb-cluster#mountclusterclientsecret
+    mountClusterClientSecret: true
+
     ## The storageClassName of the persistent volume for TiKV data storage.
-    ## Defaults to Kubernetes default storage class.
     # storageClassName: ""
 
+    ## defines additional volumes for which PVCs will be created by StatefulSet controller
+    # storageVolumes:
+    #   # this will be suffix of PVC names in VolumeClaimTemplates of TiKV StatefulSet
+    # - name: volumeName
+    #   # specify this to use special storageClass for this volume, default to component-level `storageClassName`
+    #   storageClassName: local-storage
+    #   # storage request of PVC
+    #   storageSize: 1Gi
+    #   # mount path of the PVC
+    #   mountPath: /some/path
+
+    ## run TiKV container in privileged mode
+    ## Processes in privileged containers are essentially equivalent to root on the host
+    ## NOT RECOMMENDED in production environment
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#privileged
+    # privileged: false
+
+    ## if set to true, TiDB Operator will recover newly created TiKV pods due to automatic failover
+    # recoverFailover: true
+
     ## Subdirectory within the volume to store TiKV Data. By default, the data
-    ## is stored in the root directory of volume which is mounted at
-    ## /var/lib/tikv.
+    ## is stored in the root directory of volume which is mounted at /var/lib/tikv.
     ## Specifying this will change the data directory to a subdirectory, e.g.
     ## /var/lib/tikv/data if you set the value to "data".
     ## It's dangerous to change this value for a running cluster as it will
@@ -191,105 +676,180 @@ spec:
     ## Defaults to "" (volume's root).
     # dataSubDir: ""
 
-    ## Affinity for pod assignment
+    ## defines the timeout for region leader eviction in golang `Duration` format, if raft region leaders are not transferred to other stores after this duration, TiDB Operator will delete the Pod forcibly.
+    # evictLeaderTimeout: 3m
+
+    ## Affinity for pod scheduling
     ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
     # affinity:
     #   podAntiAffinity:
     #     preferredDuringSchedulingIgnoredDuringExecution:
-    #       - podAffinityTerm:
-    #           labelSelector:
-    #             matchExpressions:
-    #               - key: app.kubernetes.io/component
-    #                 operator: In
-    #                 values:
-    #                   - tidb
-    #                   - pd
-    #           topologyKey: ""
-    #         weight: 100
-    ## If you use require affinity, you must ensure that at least 3 nodes are available in the cluster
-    #     requiredDuringSchedulingIgnoredDuringExecution:
-    #       - labelSelector:
+    #     - podAffinityTerm:
+    #         labelSelector:
     #           matchExpressions:
-    #             - key: app.kubernetes.io/component
-    #               operator: In
-    #               values:
-    #                 - tikv
-    #         topologyKey: ""
-  
-    ## Specify node labels for pods assignment
-    ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-    # nodeSelector:
-    #   app.kubernetes.io/component: tikv
-
+    #           - key: app.kubernetes.io/component
+    #             operator: In
+    #             values:
+    #             - tidb
+    #             - pd
+    #         topologyKey: kubernetes.io/hostname
+    #       weight: 100
+    #     # require not to run TiKV pods on nodes where there's already a TiKV pod running
+    #     # if setting this, you must ensure that at least `replicas` nodes are available in the cluster
+    #     requiredDuringSchedulingIgnoredDuringExecution:
+    #     - labelSelector:
+    #         matchExpressions:
+    #         - key: app.kubernetes.io/component
+    #           operator: In
+    #           values:
+    #           - tikv
+    #       topologyKey: kubernetes.io/hostname
 
-  ## ** TiDB advanced feature **
   ## Deploy TiDB Binlog of a TiDB cluster
   ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-tidb-binlog/#deploy-pump
   # pump:
   #   baseImage: pingcap/tidb-binlog
+  #   version: "v4.0.8"
   #   replicas: 1
   #   storageClassName: local-storage
   #   requests:
-  #     storage: 30Gi
-  #   schedulerName: default-scheduler
-  #   config:
-  #     addr: 0.0.0.0:8250
-  #     gc: 7
-  #     heartbeat-interval: 2
-
-  ## Ref: TiCDC is a tool for replicating the incremental data of TiDB
+  #     cpu: 1000m
+  #     memory: 1Gi
+  #     storage: 1Gi
+  #   limits:
+  #     cpu: 2000m
+  #     memory: 2Gi
+  #   imagePullPolicy: IfNotPresent
+  #   imagePullSecrets: secretName
+  #   hostNetwork: false
+  #   serviceAccount: advanced-tidb-pump
+  #   priorityClassName: system-cluster-critical
+  #   schedulerName: tidb-scheduler
+  #   nodeSelector:
+  #     app.kubernetes.io/component: pump
+  #   annotations:
+  #     node.kubernetes.io/instance-type: some-vm-type
+  #   tolerations: {}
+  #   configUpdateStrategy: RollingUpdate
+  #   statefulSetUpdateStrategy: RollingUpdate
+  #   podSecurityContext: {}
+  #   env: []
+  #   additionalContainers: []
+  #   additionalVolumes: []
+  #   additionalVolumeMounts: []
+  #   terminationGracePeriodSeconds: 30s
+  #   # Ref: https://docs.pingcap.com/tidb/stable/tidb-binlog-configuration-file#pump
+  #   config: |
+  #     gc = 7
+
+  ## TiCDC is a tool for replicating the incremental data of TiDB
   ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-ticdc/
   # ticdc:
   #   baseImage: pingcap/ticdc
+  #   version: "v4.0.8"
   #   replicas: 3
+  #   storageClassName: local-storage
+  #   requests:
+  #     cpu: 1000m
+  #     memory: 1Gi
+  #   limits:
+  #     cpu: 2000m
+  #     memory: 2Gi
+  #   imagePullPolicy: IfNotPresent
+  #   imagePullSecrets: secretName
+  #   hostNetwork: false
+  #   serviceAccount: advanced-tidb-ticdc
+  #   priorityClassName: system-cluster-critical
+  #   schedulerName: tidb-scheduler
+  #   nodeSelector:
+  #     app.kubernetes.io/component: ticdc
+  #   annotations:
+  #     node.kubernetes.io/instance-type: some-vm-type
+  #   tolerations: {}
+  #   configUpdateStrategy: RollingUpdate
+  #   statefulSetUpdateStrategy: RollingUpdate
+  #   podSecurityContext: {}
+  #   env: []
+  #   additionalContainers: []
+  #   additionalVolumes: []
+  #   additionalVolumeMounts: []
+  #   terminationGracePeriodSeconds: 30s
+  #   # Ref: https://docs.pingcap.com/tidb/stable/deploy-ticdc#add-ticdc-to-an-existing-tidb-cluster-using-binary-not-recommended
+  #   config:
+  #     timezone: UTC
+  #     gcTTL: 86400
+  #     logLevel: info
+  #     logFile: /dev/stderr
 
-
+  ## TiFlash is the columnar storage extension of TiKV
   ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-tiflash/
   # tiflash:
+  #   ###############################
+  #   # Basic TiFlash Configuration #
+  #   ###############################
   #   baseImage: pingcap/tiflash
-  #   maxFailoverCount: 3
+  #   version: "v4.0.8"
   #   replicas: 1
+  #   # limits:
+  #   #   cpu: 2000m
+  #   #   memory: 2Gi
+  #   imagePullPolicy: IfNotPresent
+  #   imagePullSecrets: secretName
+
+  #   ##################################
+  #   # Advanced TiFlash Configuration #
+  #   ##################################
+  #   maxFailoverCount: 3
+  #   hostNetwork: false
+  #   serviceAccount: advanced-tidb-tiflash
+  #   priorityClassName: system-cluster-critical
+  #   schedulerName: tidb-scheduler
+  #   nodeSelector:
+  #     app.kubernetes.io/component: tiflash
+  #   annotations:
+  #     node.kubernetes.io/instance-type: some-vm-type
+  #   tolerations: {}
+  #   configUpdateStrategy: RollingUpdate
+  #   statefulSetUpdateStrategy: RollingUpdate
+  #   podSecurityContext: {}
+  #   env: []
+  #   additionalContainers: []
+  #   additionalVolumes: []
+  #   additionalVolumeMounts: []
+  #   terminationGracePeriodSeconds: 30s
   #   storageClaims:
   #     - resources:
   #         requests:
+  #           # specify PVC storage used for TiFlash
   #           storage: 1Gi
+  #       # specify PVC storage class
   #       storageClassName: local-storage
-
-
-  # ** Persistent Volume Reclaim Configuration **
-  # Whether enable PVC reclaim for orphan PVC left by statefulset scale-in
-  enablePVReclaim: false
-
-  ## Persistent volume reclaim policy applied to the PVs that consumed by the TiDB cluster, default is Retain.
-  ## Note that the reclaim policy Recycle may not be supported by some storage types, .e.g. local.
-  ## Ref: https://kubernetes.io/docs/tasks/administer-cluster/change-pv-reclaim-policy/
-  pvReclaimPolicy: Retain
-
-  # ** TLS related Configuration **
-  # Whether enable the TLS connection between TiDB server components
-  # Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/enable-tls-between-components/
-  tlsCluster: {}
-
-
-  ## ** Global Scheduler related Configuration **
-  ## SchedulerName of TiDB cluster Pods
-  # schedulerName: tidb-scheduler
-
-  ## Affinity for pod assignment
-  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-  # affinity: {}
-
-  # priorityClassName: system-cluster-critical
-
-  ## Specify node labels for pods assignment
-  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-  # nodeSelector:
-  #   "node-role.kubernetes.io/tidb:": "true"
-
-  ## Tolerations are applied to pods, and allow (but do not require) the pods to schedule onto nodes with matching taints.
-  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-  # tolerations:
-  #   - effect: NoSchedule
-  #     key: dedicated
-  #     operator: Equal
-  #     value: tidb
+  #   # run TiFlash container in privileged mode
+  #   # Processes in privileged containers are essentially equivalent to root on the host
+  #   # NOT RECOMMENDED in production environment
+  #   # Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#privileged
+  #   privileged: false
+
+  #   # if set to true, TiDB Operator will recover newly created TiFlash pods due to automatic failover
+  #   recoverFailover: true
+
+  #   # configures serverlog/errorlog/clusterlog sidecar container resource requirements
+  #   # logTailer:
+  #   #   requests:
+  #   #     cpu: 1000m
+  #   #     memory: 1Gi
+  #   #   limits:
+  #   #     cpu: 2000m
+  #   #     memory: 2Gi
+
+  #   # TOML format configuration
+  #   # Ref: https://docs.pingcap.com/tidb/dev/tiflash-configuration
+  #   config:
+  #     # configure the configuration file for TiFlash process
+  #     config: |
+  #       [logger]
+  #         log = /data0/logs/somelog
+  #     # configure the configuration file for TiFlash Proxy process
+  #     proxy: |
+  #       [security]
+  #         cert-allowed-cn = CNNAME
diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
index 48aa72cdbf0..70eccc6d8bb 100644
--- a/pkg/apis/pingcap/v1alpha1/openapi_generated.go
+++ b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
@@ -1172,7 +1172,7 @@ func schema_pkg_apis_pingcap_v1alpha1_ComponentSpec(ref common.ReferenceCallback
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -1248,7 +1248,7 @@ func schema_pkg_apis_pingcap_v1alpha1_ComponentSpec(ref common.ReferenceCallback
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -3416,7 +3416,7 @@ func schema_pkg_apis_pingcap_v1alpha1_PDSpec(ref common.ReferenceCallback) commo
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -3492,7 +3492,7 @@ func schema_pkg_apis_pingcap_v1alpha1_PDSpec(ref common.ReferenceCallback) commo
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -3625,6 +3625,19 @@ func schema_pkg_apis_pingcap_v1alpha1_PDSpec(ref common.ReferenceCallback) commo
 							Format:      "",
 						},
 					},
+					"storageVolumes": {
+						SchemaProps: spec.SchemaProps{
+							Description: "StorageVolumes configure additional storage for PD pods.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.StorageVolume"),
+									},
+								},
+							},
+						},
+					},
 					"dataSubDir": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Subdirectory within the volume to store PD Data. By default, the data is stored in the root directory of volume which is mounted at /var/lib/pd. Specifying this will change the data directory to a subdirectory, e.g. /var/lib/pd/data if you set the value to \"data\". It's dangerous to change this value for a running cluster as it will upgrade your cluster to use a new storage directory. Defaults to \"\" (volume's root).",
@@ -3647,7 +3660,7 @@ func schema_pkg_apis_pingcap_v1alpha1_PDSpec(ref common.ReferenceCallback) commo
 					},
 					"enableDashboardInternalProxy": {
 						SchemaProps: spec.SchemaProps{
-							Description: "EnableDashboardInternalProxy would directly set `internal-proxy` in the `PdConfig`",
+							Description: "(Deprecated) EnableDashboardInternalProxy would directly set `internal-proxy` in the `PdConfig`. Note that this is deprecated, we should just set `dashboard.internal-proxy` in `pd.config`.",
 							Type:        []string{"boolean"},
 							Format:      "",
 						},
@@ -3659,19 +3672,6 @@ func schema_pkg_apis_pingcap_v1alpha1_PDSpec(ref common.ReferenceCallback) commo
 							Format:      "",
 						},
 					},
-					"storageVolumes": {
-						SchemaProps: spec.SchemaProps{
-							Description: "StorageVolumes is additional storage apply for PD node. Default to storageClassName storage class",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.StorageVolume"),
-									},
-								},
-							},
-						},
-					},
 				},
 				Required: []string{"replicas"},
 			},
@@ -4152,7 +4152,7 @@ func schema_pkg_apis_pingcap_v1alpha1_PumpSpec(ref common.ReferenceCallback) com
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -4228,7 +4228,7 @@ func schema_pkg_apis_pingcap_v1alpha1_PumpSpec(ref common.ReferenceCallback) com
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -4813,7 +4813,7 @@ func schema_pkg_apis_pingcap_v1alpha1_ServiceSpec(ref common.ReferenceCallback)
 					},
 					"loadBalancerSourceRanges": {
 						SchemaProps: spec.SchemaProps{
-							Description: "LoadBalancerSourceRanges is the loadBalancerSourceRanges of service If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.\" More info: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/ Optional: Defaults to omitted",
+							Description: "LoadBalancerSourceRanges is the loadBalancerSourceRanges of service If specified and supported by the platform, this will restrict traffic through the cloud-provider load-balancer will be restricted to the specified client IPs. This field will be ignored if the cloud-provider does not support the feature.\" More info: https://kubernetes.io/docs/concepts/services-networking/service/#aws-nlb-support Optional: Defaults to omitted",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -5115,7 +5115,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiCDCSpec(ref common.ReferenceCallback) co
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -5191,7 +5191,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiCDCSpec(ref common.ReferenceCallback) co
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -5703,7 +5703,8 @@ func schema_pkg_apis_pingcap_v1alpha1_TiDBServiceSpec(ref common.ReferenceCallba
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Type: []string{"object"},
+				Description: "TiDBServiceSpec defines `.tidb.service` field of `TidbCluster.spec`.",
+				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"externalTrafficPolicy": {
 						SchemaProps: spec.SchemaProps{
@@ -5840,7 +5841,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiDBSpec(ref common.ReferenceCallback) com
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -5916,7 +5917,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiDBSpec(ref common.ReferenceCallback) com
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -6056,16 +6057,16 @@ func schema_pkg_apis_pingcap_v1alpha1_TiDBSpec(ref common.ReferenceCallback) com
 							Format:      "",
 						},
 					},
-					"tlsClient": {
+					"slowLogTailer": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Whether enable the TLS connection between the SQL client and TiDB server Optional: Defaults to nil",
-							Ref:         ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiDBTLSClient"),
+							Description: "The specification of the slow log tailer sidecar",
+							Ref:         ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiDBSlowLogTailerSpec"),
 						},
 					},
-					"slowLogTailer": {
+					"tlsClient": {
 						SchemaProps: spec.SchemaProps{
-							Description: "The spec of the slow log tailer sidecar",
-							Ref:         ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiDBSlowLogTailerSpec"),
+							Description: "Whether enable the TLS connection between the SQL client and TiDB server Optional: Defaults to nil",
+							Ref:         ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiDBTLSClient"),
 						},
 					},
 					"plugins": {
@@ -6096,7 +6097,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiDBSpec(ref common.ReferenceCallback) com
 					},
 					"storageVolumes": {
 						SchemaProps: spec.SchemaProps{
-							Description: "StorageVolumes is additional storage apply for TiDB node. Default to storageClassName storage class",
+							Description: "StorageVolumes configure additional storage for TiDB pods.",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -6199,7 +6200,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiFlashSpec(ref common.ReferenceCallback)
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -6275,7 +6276,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiFlashSpec(ref common.ReferenceCallback)
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -8442,7 +8443,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiKVSpec(ref common.ReferenceCallback) com
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of the component. Override the cluster-level one if present Optional: Defaults to cluster-level setting",
+							Description: "Affinity of the component. Override the cluster-level setting if present. Optional: Defaults to cluster-level setting",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -8518,7 +8519,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiKVSpec(ref common.ReferenceCallback) com
 					},
 					"env": {
 						SchemaProps: spec.SchemaProps{
-							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that following env names cannot be used and may be overrided by tidb-operator built envs. - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
+							Description: "List of environment variables to set in the container, like v1.Container.Env. Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs - NAMESPACE - TZ - SERVICE_NAME - PEER_SERVICE_NAME - HEADLESS_SERVICE_NAME - SET_NAME - HOSTNAME - CLUSTER_NAME - POD_NAME - BINLOG_ENABLED - SLOW_LOG_FILE",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -8667,7 +8668,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiKVSpec(ref common.ReferenceCallback) com
 					},
 					"recoverFailover": {
 						SchemaProps: spec.SchemaProps{
-							Description: "RecoverFailover indicates that Operator can recover the failover Pods",
+							Description: "RecoverFailover indicates that Operator can recover the failed Pods",
 							Type:        []string{"boolean"},
 							Format:      "",
 						},
@@ -8688,7 +8689,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiKVSpec(ref common.ReferenceCallback) com
 					},
 					"storageVolumes": {
 						SchemaProps: spec.SchemaProps{
-							Description: "StorageVolumes is additional storage apply for TiKV node. Default to storageClassName storage class",
+							Description: "StorageVolumes configure additional storage for TiKV pods.",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
@@ -9546,7 +9547,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TidbClusterSpec(ref common.ReferenceCallba
 					},
 					"affinity": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Affinity of TiDB cluster Pods",
+							Description: "Affinity of TiDB cluster Pods. Will be overwritten by each cluster component's specific affinity setting, e.g. `spec.tidb.affinity`",
 							Ref:         ref("k8s.io/api/core/v1.Affinity"),
 						},
 					},
@@ -9609,7 +9610,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TidbClusterSpec(ref common.ReferenceCallba
 					},
 					"enableDynamicConfiguration": {
 						SchemaProps: spec.SchemaProps{
-							Description: "EnableDynamicConfiguration indicates whether DynamicConfiguration is enabled for the tidbcluster",
+							Description: "EnableDynamicConfiguration indicates whether to append `--advertise-status-addr` to the startup parameters of TiKV.",
 							Type:        []string{"boolean"},
 							Format:      "",
 						},
diff --git a/pkg/apis/pingcap/v1alpha1/tidb_config_wraper.go b/pkg/apis/pingcap/v1alpha1/tidb_config_wraper.go
index 79bd6c156c9..b4b65588253 100644
--- a/pkg/apis/pingcap/v1alpha1/tidb_config_wraper.go
+++ b/pkg/apis/pingcap/v1alpha1/tidb_config_wraper.go
@@ -26,12 +26,14 @@ import (
 var _ stdjson.Marshaler = &TiDBConfigWraper{}
 var _ stdjson.Unmarshaler = &TiDBConfigWraper{}
 
+// NewTiDBConfig returns an empty config structure
 func NewTiDBConfig() *TiDBConfigWraper {
 	return &TiDBConfigWraper{
 		GenericConfig: config.New(map[string]interface{}{}),
 	}
 }
 
+// TiDBConfigWraper simply wrapps a GenericConfig
 type TiDBConfigWraper struct {
 	*config.GenericConfig
 }
diff --git a/pkg/apis/pingcap/v1alpha1/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/tidbcluster.go
index 94acf7efefe..5b216bce3b6 100644
--- a/pkg/apis/pingcap/v1alpha1/tidbcluster.go
+++ b/pkg/apis/pingcap/v1alpha1/tidbcluster.go
@@ -599,6 +599,7 @@ func (tidbSvc *TiDBServiceSpec) ShouldExposeStatus() bool {
 	return *exposeStatus
 }
 
+// GetMySQLNodePort returns the mysqlNodePort config in spec.tidb.service
 func (tidbSvc *TiDBServiceSpec) GetMySQLNodePort() int32 {
 	mysqlNodePort := tidbSvc.MySQLNodePort
 	if mysqlNodePort == nil {
@@ -607,6 +608,7 @@ func (tidbSvc *TiDBServiceSpec) GetMySQLNodePort() int32 {
 	return int32(*mysqlNodePort)
 }
 
+// GetStatusNodePort returns the statusNodePort config in spec.tidb.service
 func (tidbSvc *TiDBServiceSpec) GetStatusNodePort() int32 {
 	statusNodePort := tidbSvc.StatusNodePort
 	if statusNodePort == nil {
diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go
index 51ec9e9246c..46ce5761f51 100644
--- a/pkg/apis/pingcap/v1alpha1/types.go
+++ b/pkg/apis/pingcap/v1alpha1/types.go
@@ -106,8 +106,8 @@ type TidbClusterList struct {
 	Items []TidbCluster `json:"items"`
 }
 
-// +k8s:openapi-gen=true
 // TidbClusterSpec describes the attributes that a user creates on a tidb cluster
+// +k8s:openapi-gen=true
 type TidbClusterSpec struct {
 	// Discovery spec
 	Discovery DiscoverySpec `json:"discovery,omitempty"`
@@ -148,10 +148,10 @@ type TidbClusterSpec struct {
 	// +optional
 	Paused bool `json:"paused,omitempty"`
 
-	// TODO: remove optional after defaulting logic introduced
 	// TiDB cluster version
 	// +optional
 	Version string `json:"version"`
+	// TODO: remove optional after defaulting logic introduced
 
 	// SchedulerName of TiDB cluster Pods
 	// +kubebuilder:default=tidb-scheduler
@@ -193,7 +193,8 @@ type TidbClusterSpec struct {
 	// +optional
 	HostNetwork *bool `json:"hostNetwork,omitempty"`
 
-	// Affinity of TiDB cluster Pods
+	// Affinity of TiDB cluster Pods.
+	// Will be overwritten by each cluster component's specific affinity setting, e.g. `spec.tidb.affinity`
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
 
@@ -219,14 +220,15 @@ type TidbClusterSpec struct {
 	// +optional
 	Timezone string `json:"timezone,omitempty"`
 
-	// Services list non-headless services type used in TidbCluster
-	// Deprecated
+	// (Deprecated) Services list non-headless services type used in TidbCluster
 	// +k8s:openapi-gen=false
 	Services []Service `json:"services,omitempty"`
+	// TODO: really deprecate this in code
 
-	// EnableDynamicConfiguration indicates whether DynamicConfiguration is enabled for the tidbcluster
+	// EnableDynamicConfiguration indicates whether to append `--advertise-status-addr` to the startup parameters of TiKV.
 	// +optional
 	EnableDynamicConfiguration *bool `json:"enableDynamicConfiguration,omitempty"`
+	// TODO: rename this into tikv-specific config name
 
 	// Cluster is the external cluster, if configured, the components in this TidbCluster will join to this configured cluster.
 	// +optional
@@ -309,7 +311,6 @@ type PDSpec struct {
 	// +kubebuilder:validation:Minimum=1
 	Replicas int32 `json:"replicas"`
 
-	// TODO: remove optional after defaulting introduced
 	// Base image of the component, image tag is now allowed during validation
 	// +kubebuilder:default=pingcap/pd
 	// +optional
@@ -331,6 +332,10 @@ type PDSpec struct {
 	// +optional
 	StorageClassName *string `json:"storageClassName,omitempty"`
 
+	// StorageVolumes configure additional storage for PD pods.
+	// +optional
+	StorageVolumes []StorageVolume `json:"storageVolumes,omitempty"`
+
 	// Subdirectory within the volume to store PD Data. By default, the data
 	// is stored in the root directory of volume which is mounted at
 	// /var/lib/pd.
@@ -351,18 +356,14 @@ type PDSpec struct {
 	// +optional
 	TLSClientSecretName *string `json:"tlsClientSecretName,omitempty"`
 
-	// EnableDashboardInternalProxy would directly set `internal-proxy` in the `PdConfig`
+	// (Deprecated) EnableDashboardInternalProxy would directly set `internal-proxy` in the `PdConfig`.
+	// Note that this is deprecated, we should just set `dashboard.internal-proxy` in `pd.config`.
 	// +optional
 	EnableDashboardInternalProxy *bool `json:"enableDashboardInternalProxy,omitempty"`
 
 	// MountClusterClientSecret indicates whether to mount `cluster-client-secret` to the Pod
 	// +optional
 	MountClusterClientSecret *bool `json:"mountClusterClientSecret,omitempty"`
-
-	// StorageVolumes is additional storage apply for PD node.
-	// Default to storageClassName storage class
-	// +optional
-	StorageVolumes []StorageVolume `json:"storageVolumes,omitempty"`
 }
 
 // TiKVSpec contains details of TiKV members
@@ -378,7 +379,6 @@ type TiKVSpec struct {
 	// +kubebuilder:validation:Minimum=1
 	Replicas int32 `json:"replicas"`
 
-	// TODO: remove optional after defaulting introduced
 	// Base image of the component, image tag is now allowed during validation
 	// +kubebuilder:default=pingcap/tikv
 	// +optional
@@ -416,7 +416,7 @@ type TiKVSpec struct {
 	// +optional
 	Config *TiKVConfigWraper `json:"config,omitempty"`
 
-	// RecoverFailover indicates that Operator can recover the failover Pods
+	// RecoverFailover indicates that Operator can recover the failed Pods
 	// +optional
 	RecoverFailover bool `json:"recoverFailover,omitempty"`
 
@@ -429,8 +429,7 @@ type TiKVSpec struct {
 	// +optional
 	EvictLeaderTimeout *string `json:"evictLeaderTimeout,omitempty"`
 
-	// StorageVolumes is additional storage apply for TiKV node.
-	// Default to storageClassName storage class
+	// StorageVolumes configure additional storage for TiKV pods.
 	// +optional
 	StorageVolumes []StorageVolume `json:"storageVolumes,omitempty"`
 }
@@ -529,14 +528,14 @@ type TiCDCConfig struct {
 	LogFile *string `json:"logFile,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 // LogTailerSpec represents an optional log tailer sidecar container
+// +k8s:openapi-gen=true
 type LogTailerSpec struct {
 	corev1.ResourceRequirements `json:",inline"`
 }
 
-// +k8s:openapi-gen=true
 // StorageClaim contains details of TiFlash storages
+// +k8s:openapi-gen=true
 type StorageClaim struct {
 	// Resources represents the minimum resources the volume should have.
 	// More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -548,8 +547,8 @@ type StorageClaim struct {
 	StorageClassName *string `json:"storageClassName,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 // TiDBSpec contains details of TiDB members
+// +k8s:openapi-gen=true
 type TiDBSpec struct {
 	ComponentSpec               `json:",inline"`
 	corev1.ResourceRequirements `json:",inline"`
@@ -561,7 +560,6 @@ type TiDBSpec struct {
 	// +kubebuilder:validation:Minimum=0
 	Replicas int32 `json:"replicas"`
 
-	// TODO: remove optional after defaulting introduced
 	// Base image of the component, image tag is now allowed during validation
 	// +kubebuilder:default=pingcap/tidb
 	// +optional
@@ -588,18 +586,20 @@ type TiDBSpec struct {
 	// +optional
 	SeparateSlowLog *bool `json:"separateSlowLog,omitempty"`
 
+	// The specification of the slow log tailer sidecar
+	// +optional
+	SlowLogTailer *TiDBSlowLogTailerSpec `json:"slowLogTailer,omitempty"`
+
 	// Whether enable the TLS connection between the SQL client and TiDB server
 	// Optional: Defaults to nil
 	// +optional
 	TLSClient *TiDBTLSClient `json:"tlsClient,omitempty"`
 
-	// The spec of the slow log tailer sidecar
-	// +optional
-	SlowLogTailer *TiDBSlowLogTailerSpec `json:"slowLogTailer,omitempty"`
-
 	// Plugins is a list of plugins that are loaded by TiDB server, empty means plugin disabled
 	// +optional
 	Plugins []string `json:"plugins,omitempty"`
+	// TODO: additional volumes should be used to hold .so plugin binaries.
+	// Because this is not a complete implementation, maybe we can change this without backward compatibility.
 
 	// Config is the Configuration of tidb-servers
 	// +optional
@@ -611,8 +611,7 @@ type TiDBSpec struct {
 	// +optional
 	Lifecycle *corev1.Lifecycle `json:"lifecycle,omitempty"`
 
-	// StorageVolumes is additional storage apply for TiDB node.
-	// Default to storageClassName storage class
+	// StorageVolumes configure additional storage for TiDB pods.
 	// +optional
 	StorageVolumes []StorageVolume `json:"storageVolumes,omitempty"`
 
@@ -627,12 +626,14 @@ type TiDBSpec struct {
 }
 
 const (
-	TCPProbeType     string = "tcp"
+	// TCPProbeType represents the readiness prob method with TCP
+	TCPProbeType string = "tcp"
+	// CommandProbeType represents the readiness prob method with arbitrary unix `exec` call format commands
 	CommandProbeType string = "command"
 )
 
-// +k8s:openapi-gen=true
 // TiDBProbe contains details of probing tidb.
+// +k8s:openapi-gen=true
 // default probe by TCPPort on 4000.
 type TiDBProbe struct {
 	// "tcp" will use TCP socket to connetct port 4000
@@ -645,8 +646,8 @@ type TiDBProbe struct {
 	Type *string `json:"type,omitempty"` // tcp or command
 }
 
-// +k8s:openapi-gen=true
 // PumpSpec contains details of Pump members
+// +k8s:openapi-gen=true
 type PumpSpec struct {
 	ComponentSpec               `json:",inline"`
 	corev1.ResourceRequirements `json:",inline"`
@@ -658,7 +659,6 @@ type PumpSpec struct {
 	// +kubebuilder:validation:Minimum=0
 	Replicas int32 `json:"replicas"`
 
-	// TODO: remove optional after defaulting introduced
 	// Base image of the component, image tag is now allowed during validation
 	// +kubebuilder:default=pingcap/tidb-binlog
 	// +optional
@@ -669,7 +669,6 @@ type PumpSpec struct {
 	// +optional
 	StorageClassName *string `json:"storageClassName,omitempty"`
 
-	// TODO: add schema
 	// The configuration of Pump cluster.
 	// +optional
 	Config *config.GenericConfig `json:"config,omitempty"`
@@ -679,8 +678,8 @@ type PumpSpec struct {
 	SetTimeZone *bool `json:"setTimeZone,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 // HelperSpec contains details of helper component
+// +k8s:openapi-gen=true
 type HelperSpec struct {
 	// Image used to tail slow log and set kernel parameters if necessary, must have `tail` and `sysctl` installed
 	// Optional: Defaults to busybox:1.26.2
@@ -693,27 +692,27 @@ type HelperSpec struct {
 	ImagePullPolicy *corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 // TiDBSlowLogTailerSpec represents an optional log tailer sidecar with TiDB
+// +k8s:openapi-gen=true
 type TiDBSlowLogTailerSpec struct {
 	corev1.ResourceRequirements `json:",inline"`
 
-	// Image used for slowlog tailer
-	// Deprecated, use TidbCluster.HelperImage instead
+	// (Deprecated) Image used for slowlog tailer.
+	// Use `spec.helper.image` instead
 	// +k8s:openapi-gen=false
 	Image *string `json:"image,omitempty"`
 
-	// ImagePullPolicy of the component. Override the cluster-level imagePullPolicy if present
-	// Deprecated, use TidbCluster.HelperImagePullPolicy instead
+	// (Deprecated) ImagePullPolicy of the component. Override the cluster-level imagePullPolicy if present
+	// Use `spec.helper.imagePullPolicy` instead
 	// +k8s:openapi-gen=false
 	ImagePullPolicy *corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
 }
 
-// +k8s:openapi-gen=true
 // ComponentSpec is the base spec of each component, the fields should always accessed by the Basic<Component>Spec() method to respect the cluster-level properties
+// +k8s:openapi-gen=true
 type ComponentSpec struct {
-	// Image of the component, override baseImage and version if present
-	// Deprecated
+	// (Deprecated) Image of the component
+	// Use `baseImage` and `version` instead
 	// +k8s:openapi-gen=false
 	Image string `json:"image,omitempty"`
 
@@ -736,7 +735,7 @@ type ComponentSpec struct {
 	// +optional
 	HostNetwork *bool `json:"hostNetwork,omitempty"`
 
-	// Affinity of the component. Override the cluster-level one if present
+	// Affinity of the component. Override the cluster-level setting if present.
 	// Optional: Defaults to cluster-level setting
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
@@ -775,10 +774,8 @@ type ComponentSpec struct {
 	// +optional
 	ConfigUpdateStrategy *ConfigUpdateStrategy `json:"configUpdateStrategy,omitempty"`
 
-	// List of environment variables to set in the container, like
-	// v1.Container.Env.
-	// Note that following env names cannot be used and may be overrided by
-	// tidb-operator built envs.
+	// List of environment variables to set in the container, like v1.Container.Env.
+	// Note that the following env names cannot be used and will be overridden by TiDB Operator builtin envs
 	// - NAMESPACE
 	// - TZ
 	// - SERVICE_NAME
@@ -848,12 +845,13 @@ type ServiceSpec struct {
 	// If specified and supported by the platform, this will restrict traffic through the cloud-provider
 	// load-balancer will be restricted to the specified client IPs. This field will be ignored if the
 	// cloud-provider does not support the feature."
-	// More info: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/
+	// More info: https://kubernetes.io/docs/concepts/services-networking/service/#aws-nlb-support
 	// Optional: Defaults to omitted
 	// +optional
 	LoadBalancerSourceRanges []string `json:"loadBalancerSourceRanges,omitempty"`
 }
 
+// TiDBServiceSpec defines `.tidb.service` field of `TidbCluster.spec`.
 // +k8s:openapi-gen=true
 type TiDBServiceSpec struct {
 	// +k8s:openapi-gen=false
@@ -885,9 +883,8 @@ type TiDBServiceSpec struct {
 	AdditionalPorts []corev1.ServicePort `json:"additionalPorts,omitempty"`
 }
 
+// (Deprecated) Service represent service type used in TidbCluster
 // +k8s:openapi-gen=false
-// Deprecated
-// Service represent service type used in TidbCluster
 type Service struct {
 	Name string `json:"name,omitempty"`
 	Type string `json:"type,omitempty"`
@@ -1041,14 +1038,14 @@ type TiDBTLSClient struct {
 	Enabled bool `json:"enabled,omitempty"`
 }
 
-// TLSCluster can enable TLS connection between TiDB server components
+// TLSCluster can enable mutual TLS connection between TiDB cluster components
 // https://pingcap.com/docs/stable/how-to/secure/enable-tls-between-components/
 type TLSCluster struct {
-	// Enable mutual TLS authentication among TiDB components
+	// Enable mutual TLS connection between TiDB cluster components
 	// Once enabled, the mutual authentication applies to all components,
 	// and it does not support applying to only part of the components.
 	// The steps to enable this feature:
-	//   1. Generate TiDB server components certificates and a client-side certifiacete for them.
+	//   1. Generate TiDB cluster components certificates and a client-side certifiacete for them.
 	//      There are multiple ways to generate these certificates:
 	//        - user-provided certificates: https://pingcap.com/docs/stable/how-to/secure/generate-self-signed-certificates/
 	//        - use the K8s built-in certificate signing system signed certificates: https://kubernetes.io/docs/tasks/tls/managing-tls-in-a-cluster/
@@ -1562,7 +1559,8 @@ type IngressSpec struct {
 	TLS []extensionsv1beta1.IngressTLS `json:"tls,omitempty"`
 }
 
-// StorageVolume is TiKV storage information
+// StorageVolume configures additional storage for PD/TiDB/TiKV pods.
+// If `StorageClassName` not set, default to the `spec.[pd|tidb|tikv].storageClassName`
 type StorageVolume struct {
 	Name             string  `json:"name"`
 	StorageClassName *string `json:"storageClassName,omitempty"`
diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
index 207fd92ded4..93e925bda16 100644
--- a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
@@ -2741,6 +2741,13 @@ func (in *PDSpec) DeepCopyInto(out *PDSpec) {
 		*out = new(string)
 		**out = **in
 	}
+	if in.StorageVolumes != nil {
+		in, out := &in.StorageVolumes, &out.StorageVolumes
+		*out = make([]StorageVolume, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	if in.Config != nil {
 		in, out := &in.Config, &out.Config
 		*out = new(PDConfigWraper)
@@ -2761,13 +2768,6 @@ func (in *PDSpec) DeepCopyInto(out *PDSpec) {
 		*out = new(bool)
 		**out = **in
 	}
-	if in.StorageVolumes != nil {
-		in, out := &in.StorageVolumes, &out.StorageVolumes
-		*out = make([]StorageVolume, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 	return
 }
 
@@ -4449,16 +4449,16 @@ func (in *TiDBSpec) DeepCopyInto(out *TiDBSpec) {
 		*out = new(bool)
 		**out = **in
 	}
-	if in.TLSClient != nil {
-		in, out := &in.TLSClient, &out.TLSClient
-		*out = new(TiDBTLSClient)
-		**out = **in
-	}
 	if in.SlowLogTailer != nil {
 		in, out := &in.SlowLogTailer, &out.SlowLogTailer
 		*out = new(TiDBSlowLogTailerSpec)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.TLSClient != nil {
+		in, out := &in.TLSClient, &out.TLSClient
+		*out = new(TiDBTLSClient)
+		**out = **in
+	}
 	if in.Plugins != nil {
 		in, out := &in.Plugins, &out.Plugins
 		*out = make([]string, len(*in))
diff --git a/pkg/discovery/discovery.go b/pkg/discovery/discovery.go
index 41b552e8f82..3955da780bf 100644
--- a/pkg/discovery/discovery.go
+++ b/pkg/discovery/discovery.go
@@ -76,7 +76,6 @@ func (d *tidbDiscovery) Discover(advertisePeerUrl string) (string, error) {
 		return "", err
 	}
 	keyName := fmt.Sprintf("%s/%s", ns, tcName)
-	pdAddresses := tc.Spec.PDAddresses
 
 	currentCluster := d.clusters[keyName]
 	if currentCluster == nil || currentCluster.resourceVersion != tc.ResourceVersion {
@@ -91,9 +90,12 @@ func (d *tidbDiscovery) Discover(advertisePeerUrl string) (string, error) {
 	// Should take failover replicas into consideration
 	if len(currentCluster.peers) == int(tc.PDStsDesiredReplicas()) {
 		delete(currentCluster.peers, podName)
+		pdAddresses := tc.Spec.PDAddresses
+		// Join an existing PD cluster if tc.Spec.PDAddresses is set
 		if len(pdAddresses) != 0 {
 			return fmt.Sprintf("--join=%s", strings.Join(pdAddresses, ",")), nil
 		}
+		// Initialize the PD cluster in the normal format service record.
 		return fmt.Sprintf("--initial-cluster=%s=%s://%s", podName, tc.Scheme(), advertisePeerUrl), nil
 	}
 
diff --git a/pkg/label/label.go b/pkg/label/label.go
index 07dfdcb24b1..a103f9ba90b 100644
--- a/pkg/label/label.go
+++ b/pkg/label/label.go
@@ -63,7 +63,7 @@ const (
 	// BackupProtectionFinalizer is the name of finalizer on backups
 	BackupProtectionFinalizer string = "tidb.pingcap.com/backup-protection"
 
-	// High availability is realized based on the topology
+	// AnnHATopologyKey defines the High availability topology key
 	AnnHATopologyKey = "pingcap.com/ha-topology-key"
 
 	// AnnFailTiDBScheduler is for injecting a failure into the TiDB custom scheduler
@@ -87,7 +87,7 @@ const (
 	AnnSysctlInit = "tidb.pingcap.com/sysctl-init"
 	// AnnEvictLeaderBeginTime is pod annotation key to indicate the begin time for evicting region leader
 	AnnEvictLeaderBeginTime = "tidb.pingcap.com/evictLeaderBeginTime"
-	// AnnStsSyncTimestamp is sts annotation key to indicate the last timestamp the operator sync the sts
+	// AnnStsLastSyncTimestamp is sts annotation key to indicate the last timestamp the operator sync the sts
 	AnnStsLastSyncTimestamp = "tidb.pingcap.com/sync-timestamp"
 
 	// AnnForceUpgradeVal is tc annotation value to indicate whether force upgrade should be done
@@ -97,11 +97,11 @@ const (
 
 	// AnnPDDeleteSlots is annotation key of pd delete slots.
 	AnnPDDeleteSlots = "pd.tidb.pingcap.com/delete-slots"
-	// TiDBDeleteSlots is annotation key of tidb delete slots.
+	// AnnTiDBDeleteSlots is annotation key of tidb delete slots.
 	AnnTiDBDeleteSlots = "tidb.tidb.pingcap.com/delete-slots"
-	// TiKVDeleteSlots is annotation key of tikv delete slots.
+	// AnnTiKVDeleteSlots is annotation key of tikv delete slots.
 	AnnTiKVDeleteSlots = "tikv.tidb.pingcap.com/delete-slots"
-	// TiFlashDeleteSlots is annotation key of tiflash delete slots.
+	// AnnTiFlashDeleteSlots is annotation key of tiflash delete slots.
 	AnnTiFlashDeleteSlots = "tiflash.tidb.pingcap.com/delete-slots"
 
 	// AnnTiDBLastAutoScalingTimestamp is annotation key of tidbcluster to indicate the last timestamp for tidb auto-scaling
@@ -250,20 +250,17 @@ func (l Label) Initializer(val string) Label {
 
 // CleanJob assigns clean to component key in label
 func (l Label) CleanJob() Label {
-	l.Component(CleanJobLabelVal)
-	return l
+	return l.Component(CleanJobLabelVal)
 }
 
 // BackupJob assigns backup to component key in label
 func (l Label) BackupJob() Label {
-	l.Component(BackupJobLabelVal)
-	return l
+	return l.Component(BackupJobLabelVal)
 }
 
 // RestoreJob assigns restore to component key in label
 func (l Label) RestoreJob() Label {
-	l.Component(RestoreJobLabelVal)
-	return l
+	return l.Component(RestoreJobLabelVal)
 }
 
 // Backup assigns specific value to backup key in label
@@ -286,84 +283,78 @@ func (l Label) Restore(val string) Label {
 
 // PD assigns pd to component key in label
 func (l Label) PD() Label {
-	l.Component(PDLabelVal)
-	return l
+	return l.Component(PDLabelVal)
+}
+
+// IsPD returns whether label is a PD component
+func (l Label) IsPD() bool {
+	return l[ComponentLabelKey] == PDLabelVal
 }
 
 // Pump assigns pump to component key in label
 func (l Label) Pump() Label {
-	l.Component(PumpLabelVal)
-	return l
+	return l.Component(PumpLabelVal)
 }
 
 func (l Label) IsPump() bool {
 	return l[ComponentLabelKey] == PumpLabelVal
 }
 
+// Monitor assigns monitor to component key in label
 func (l Label) Monitor() Label {
-	l.Component(TiDBMonitorVal)
-	return l
+	return l.Component(TiDBMonitorVal)
 }
 
+// IsMonitor returns whether label is a Monitor component
 func (l Label) IsMonitor() bool {
 	return l[ComponentLabelKey] == TiDBMonitorVal
 }
 
 // Discovery assigns discovery to component key in label
 func (l Label) Discovery() Label {
-	l.Component(DiscoveryLabelVal)
-	return l
-}
-
-// IsPD returns whether label is a PD
-func (l Label) IsPD() bool {
-	return l[ComponentLabelKey] == PDLabelVal
+	return l.Component(DiscoveryLabelVal)
 }
 
 // TiDB assigns tidb to component key in label
 func (l Label) TiDB() Label {
-	l.Component(TiDBLabelVal)
-	return l
+	return l.Component(TiDBLabelVal)
+}
+
+// IsTiDB returns whether label is a TiDB component
+func (l Label) IsTiDB() bool {
+	return l[ComponentLabelKey] == TiDBLabelVal
 }
 
 // TiKV assigns tikv to component key in label
 func (l Label) TiKV() Label {
-	l.Component(TiKVLabelVal)
-	return l
+	return l.Component(TiKVLabelVal)
+}
+
+// IsTiKV returns whether label is a TiKV component
+func (l Label) IsTiKV() bool {
+	return l[ComponentLabelKey] == TiKVLabelVal
 }
 
 // TiFlash assigns tiflash to component key in label
 func (l Label) TiFlash() Label {
-	l.Component(TiFlashLabelVal)
-	return l
+	return l.Component(TiFlashLabelVal)
 }
 
-// IsTiFlash returns whether label is a TiFlash
+// IsTiFlash returns whether label is a TiFlash component
 func (l Label) IsTiFlash() bool {
 	return l[ComponentLabelKey] == TiFlashLabelVal
 }
 
 // TiCDC assigns ticdc to component key in label
 func (l Label) TiCDC() Label {
-	l.Component(TiCDCLabelVal)
-	return l
+	return l.Component(TiCDCLabelVal)
 }
 
-// IsTiCDC returns whether label is a TiCDC
+// IsTiCDC returns whether label is a TiCDC component
 func (l Label) IsTiCDC() bool {
 	return l[ComponentLabelKey] == TiCDCLabelVal
 }
 
-// IsTiKV returns whether label is a TiKV
-func (l Label) IsTiKV() bool {
-	return l[ComponentLabelKey] == TiKVLabelVal
-}
-
-// IsTiDB returns whether label is a TiDB
-func (l Label) IsTiDB() bool {
-	return l[ComponentLabelKey] == TiDBLabelVal
-}
-
 // Selector gets labels.Selector from label
 func (l Label) Selector() (labels.Selector, error) {
 	return metav1.LabelSelectorAsSelector(l.LabelSelector())
diff --git a/pkg/manager/member/pd_failover.go b/pkg/manager/member/pd_failover.go
index 5640ff9865f..f5019a61a88 100644
--- a/pkg/manager/member/pd_failover.go
+++ b/pkg/manager/member/pd_failover.go
@@ -77,6 +77,7 @@ func (f *pdFailover) Failover(tc *v1alpha1.TidbCluster) error {
 		return nil
 	}
 
+	// TODO: refactor this calculation to simply use `failureReplicas`
 	notDeletedCount := 0
 	for _, pdMember := range tc.Status.PD.FailureMembers {
 		if !pdMember.MemberDeleted {
diff --git a/pkg/manager/meta/reclaim_policy_manager.go b/pkg/manager/meta/reclaim_policy_manager.go
index 348effce851..1dbdc6587a7 100644
--- a/pkg/manager/meta/reclaim_policy_manager.go
+++ b/pkg/manager/meta/reclaim_policy_manager.go
@@ -73,7 +73,7 @@ func (m *reclaimPolicyManager) sync(kind, ns, instanceName string, isPVReclaimEn
 		}
 
 		if isPVReclaimEnabled && len(pvc.Annotations[label.AnnPVCDeferDeleting]) != 0 {
-			// If the pv reclaim function is turned on, and when pv is the candidate pv to be reclaimed, skip patch this pv.
+			// If the PV reclaim setting is enabled, and when PV is a candidate to be reclaimed, skip patching this PV.
 			continue
 		}
 		pv, err := m.deps.PVLister.Get(pvc.Spec.VolumeName)
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 281362bf0e4..57f35f604ae 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -27,7 +27,7 @@ import (
 
 type GenericConfig struct {
 	// Export this field to make "apiequality.Semantic.DeepEqual" happy now.
-	// User of GenericConfig should do not directly access this field.
+	// User of GenericConfig should not directly access this field.
 	MP map[string]interface{}
 }
 
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 4ea83cd1ef2..38fd4fbf416 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -329,9 +329,10 @@ func BuildStorageVolumeAndVolumeMount(storageVolumes []v1alpha1.StorageVolume, d
 			} else {
 				tmpStorageClass = defaultStorageClassName
 			}
-			volumeClaims = append(volumeClaims, VolumeClaimTemplate(storageRequest, fmt.Sprintf("%s-%s", memberType.String(), storageVolume.Name), tmpStorageClass))
+			pvcNameInVCT := fmt.Sprintf("%s-%s", memberType.String(), storageVolume.Name)
+			volumeClaims = append(volumeClaims, VolumeClaimTemplate(storageRequest, pvcNameInVCT, tmpStorageClass))
 			volMounts = append(volMounts, corev1.VolumeMount{
-				Name: fmt.Sprintf("%s-%s", memberType.String(), storageVolume.Name), MountPath: storageVolume.MountPath,
+				Name: pvcNameInVCT, MountPath: storageVolume.MountPath,
 			})
 		}
 	}
diff --git a/pkg/webhook/pod/tikv_util.go b/pkg/webhook/pod/tikv_util.go
index 780a0cae884..e23c8c34ae3 100644
--- a/pkg/webhook/pod/tikv_util.go
+++ b/pkg/webhook/pod/tikv_util.go
@@ -86,6 +86,7 @@ func addEvictLeaderAnnotation(kubeCli kubernetes.Interface, pod *core.Pod) error
 	return nil
 }
 
+// TODO: this is basically the same as pkg/manager/member/tikv_upgrader.go:readyToUpgrade. we should melt them into one func, which tells whether the tikv pod contains region leader
 func isTiKVReadyToUpgrade(upgradePod *core.Pod, store *pdapi.StoreInfo, evictLeaderTimeout time.Duration) bool {
 
 	if store.Status.LeaderCount == 0 {