fix: add label overwrite for tiproxy component val compatibility

Signed-off-by: xhe <[email protected]>
pingcap · Jul 21, 2023 · 27bb599 · 27bb599
1 parent 2aa655d
commit 27bb599
Show file tree

Hide file tree

Showing 9 changed files with 198 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
@@ -7451,9 +7451,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -9990,9 +9995,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -10122,9 +10132,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -12590,9 +12605,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -18429,9 +18449,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -21004,9 +21029,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -23538,9 +23568,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -26049,9 +26084,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -28742,9 +28782,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -31291,9 +31336,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -33829,9 +33879,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -36311,9 +36366,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -36349,9 +36409,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -40299,9 +40364,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -47652,9 +47722,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -47790,9 +47865,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
@@ -2866,9 +2866,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -5405,9 +5410,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array
@@ -5537,9 +5547,14 @@ spec:
               topologySpreadConstraints:
                 items:
                   properties:
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     topologyKey:
                       type: string
                   required:
+                  - matchLabels
                   - topologyKey
                   type: object
                 type: array
@@ -8005,9 +8020,14 @@ spec:
                   topologySpreadConstraints:
                     items:
                       properties:
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
                         topologyKey:
                           type: string
                       required:
+                      - matchLabels
                       - topologyKey
                       type: object
                     type: array