add regex

Signed-off-by: dehaocheng <[email protected]>
kubesphere · Aug 16, 2023 · 212f303 · 212f303
1 parent 09113ce
commit 212f303
Show file tree

Hide file tree

Showing 19 changed files with 478 additions and 384 deletions.
diff --git a/config/bundle.yaml b/config/bundle.yaml
diff --git a/config/crd/bases/notification.kubesphere.io_notificationmanagers.yaml b/config/crd/bases/notification.kubesphere.io_notificationmanagers.yaml
@@ -3790,9 +3790,6 @@ spec:
                             description: matchExpressions is a list of label selector
                               requirements. The requirements are ANDed.
                             items:
-                              description: A label selector requirement is a selector
-                                that contains values, a key, and an operator that
-                                relates the key and values.
                               properties:
                                 key:
                                   description: key is the label key that the selector
@@ -3803,6 +3800,8 @@ spec:
                                     to a set of values. Valid operators are In, NotIn,
                                     Exists and DoesNotExist.
                                   type: string
+                                regexValues:
+                                  type: string
                                 values:
                                   description: values is an array of string values.
                                     If the operator is In or NotIn, the values array
@@ -4103,9 +4102,6 @@ spec:
                             description: matchExpressions is a list of label selector
                               requirements. The requirements are ANDed.
                             items:
-                              description: A label selector requirement is a selector
-                                that contains values, a key, and an operator that
-                                relates the key and values.
                               properties:
                                 key:
                                   description: key is the label key that the selector
@@ -4116,6 +4112,8 @@ spec:
                                     to a set of values. Valid operators are In, NotIn,
                                     Exists and DoesNotExist.
                                   type: string
+                                regexValues:
+                                  type: string
                                 values:
                                   description: values is an array of string values.
                                     If the operator is In or NotIn, the values array

diff --git a/config/crd/bases/notification.kubesphere.io_receivers.yaml b/config/crd/bases/notification.kubesphere.io_receivers.yaml
diff --git a/config/crd/bases/notification.kubesphere.io_routers.yaml b/config/crd/bases/notification.kubesphere.io_routers.yaml
@@ -39,18 +39,11 @@ spec:
             description: RouterSpec defines the desired state of Router
             properties:
               alertSelector:
-                description: A label selector is a label query over a set of resources.
-                  The result of matchLabels and matchExpressions are ANDed. An empty
-                  label selector matches all objects. A null label selector matches
-                  no objects.
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
                       The requirements are ANDed.
                     items:
-                      description: A label selector requirement is a selector that
-                        contains values, a key, and an operator that relates the key
-                        and values.
                       properties:
                         key:
                           description: key is the label key that the selector applies
@@ -61,6 +54,8 @@ spec:
                             a set of values. Valid operators are In, NotIn, Exists
                             and DoesNotExist.
                           type: string
+                        regexValues:
+                          type: string
                         values:
                           description: values is an array of string values. If the
                             operator is In or NotIn, the values array must be non-empty.
@@ -113,18 +108,11 @@ spec:
                   regexName:
                     type: string
                   selector:
-                    description: A label selector is a label query over a set of resources.
-                      The result of matchLabels and matchExpressions are ANDed. An
-                      empty label selector matches all objects. A null label selector
-                      matches no objects.
                     properties:
                       matchExpressions:
                         description: matchExpressions is a list of label selector
                           requirements. The requirements are ANDed.
                         items:
-                          description: A label selector requirement is a selector
-                            that contains values, a key, and an operator that relates
-                            the key and values.
                           properties:
                             key:
                               description: key is the label key that the selector
@@ -135,6 +123,8 @@ spec:
                                 to a set of values. Valid operators are In, NotIn,
                                 Exists and DoesNotExist.
                               type: string
+                            regexValues:
+                              type: string
                             values:
                               description: values is an array of string values. If
                                 the operator is In or NotIn, the values array must

diff --git a/config/crd/bases/notification.kubesphere.io_silences.yaml b/config/crd/bases/notification.kubesphere.io_silences.yaml
@@ -46,18 +46,11 @@ spec:
                 description: whether the silence is enabled
                 type: boolean
               matcher:
-                description: A label selector is a label query over a set of resources.
-                  The result of matchLabels and matchExpressions are ANDed. An empty
-                  label selector matches all objects. A null label selector matches
-                  no objects.
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
                       The requirements are ANDed.
                     items:
-                      description: A label selector requirement is a selector that
-                        contains values, a key, and an operator that relates the key
-                        and values.
                       properties:
                         key:
                           description: key is the label key that the selector applies
@@ -68,6 +61,8 @@ spec:
                             a set of values. Valid operators are In, NotIn, Exists
                             and DoesNotExist.
                           type: string
+                        regexValues:
+                          type: string
                         values:
                           description: values is an array of string values. If the
                             operator is In or NotIn, the values array must be non-empty.