fix: add label overwrite for tiproxy component val compatibility

Signed-off-by: xhe <xw897002528@gmail.com>
pingcap · Jul 21, 2023 · 4219b31 · 4219b31
1 parent ed5fba3
commit 4219b31
Show file tree

Hide file tree

Showing 14 changed files with 358 additions and 5 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -25489,6 +25489,16 @@ LabelSelector is generated by component type
 See pkg/apis/pingcap/v1alpha1/tidbcluster_component.go#TopologySpreadConstraints()</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>matchLabels</code></br>
+<em>
+github.com/pingcap/tidb-operator/pkg/apis/label.Label
+</em>
+</td>
+<td>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="txnlocallatches">TxnLocalLatches</h3>

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -6921,9 +6921,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -9334,9 +9339,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -9464,9 +9474,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -11806,9 +11821,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -17307,9 +17327,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -19756,9 +19781,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -22162,9 +22192,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -24547,9 +24582,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -27114,9 +27154,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -29537,9 +29582,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -31949,9 +31999,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -34305,9 +34360,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -34343,9 +34403,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -38146,9 +38211,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -45202,9 +45272,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -45338,9 +45413,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array

diff --git a/manifests/crd/v1/pingcap.com_dmclusters.yaml b/manifests/crd/v1/pingcap.com_dmclusters.yaml
@@ -2648,9 +2648,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -5061,9 +5066,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -5191,9 +5201,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -7533,9 +7548,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array