Merge branch 'master' into upgrade-kernel

pingcap · Sep 24, 2024 · 85a5a8d · 85a5a8d
2 parents 93c67d8 + 8dbaabe
commit 85a5a8d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -824,7 +824,7 @@ spec:
   #     app.kubernetes.io/component: pump
   #   annotations:
   #     node.kubernetes.io/instance-type: some-vm-type
-  #   tolerations: {}
+  #   tolerations: []
   #   configUpdateStrategy: RollingUpdate
   #   statefulSetUpdateStrategy: RollingUpdate
   #   podSecurityContext: {}
@@ -868,7 +868,7 @@ spec:
   #     app.kubernetes.io/component: ticdc
   #   annotations:
   #     node.kubernetes.io/instance-type: some-vm-type
-  #   tolerations: {}
+  #   tolerations: []
   #   configUpdateStrategy: RollingUpdate
   #   statefulSetUpdateStrategy: RollingUpdate
   #   podSecurityContext: {}
@@ -918,7 +918,7 @@ spec:
   #     app.kubernetes.io/component: tiflash
   #   annotations:
   #     node.kubernetes.io/instance-type: some-vm-type
-  #   tolerations: {}
+  #   tolerations: []
   #   configUpdateStrategy: RollingUpdate
   #   statefulSetUpdateStrategy: RollingUpdate
   #   podSecurityContext: {}
@@ -970,7 +970,7 @@ spec:
   #     # configure the configuration file for TiFlash Proxy process
   #     proxy: |
   #       [security]
-  #         cert-allowed-cn = "CNNAME"
+  #         cert-allowed-cn = ["CNNAME"]
   #   # TopologySpreadConstraints for pod scheduling, will overwrite the cluster level spread constraints setting
   #   # Ref: pkg/apis/pingcap/v1alpha1/types.go#TopologySpreadConstraint
   #   topologySpreadConstraints: