Match cel expressions format from celSelectors

bhperry · bhperry · commit 970c24864638 · 2025-04-23T16:15:41.000-05:00
Signed-off-by: Ben Perry &lt;bhperry94@gmail.com&gt;
diff --git a/addon/v1alpha1/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml b/addon/v1alpha1/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml
@@ -187,19 +187,7 @@ spec:
                                   CelExpressions defines the CEL expressions to be evaluated for the condition.
                                   Final result is the logical AND of all expressions.
                                 items:
-                                  properties:
-                                    expression:
-                                      description: |-
-                                        Expression represents the CEL expression to be evaluated on the manifest.
-                                        The expression must evaluate to a bool.
-                                        If the expression evaluates to any other type, the condition's status will be False.
-                                        Ref to https://kubernetes.io/docs/reference/using-api/cel/ on how to write CEL
-                                        Variables:
-                                        - object: The current instance of the manifest
-                                      type: string
-                                  required:
-                                  - expression
-                                  type: object
+                                  type: string
                                 type: array
                               condition:
                                 description: |-
diff --git a/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml b/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml
@@ -172,19 +172,7 @@ spec:
                               CelExpressions defines the CEL expressions to be evaluated for the condition.
                               Final result is the logical AND of all expressions.
                             items:
-                              properties:
-                                expression:
-                                  description: |-
-                                    Expression represents the CEL expression to be evaluated on the manifest.
-                                    The expression must evaluate to a bool.
-                                    If the expression evaluates to any other type, the condition's status will be False.
-                                    Ref to https://kubernetes.io/docs/reference/using-api/cel/ on how to write CEL
-                                    Variables:
-                                    - object: The current instance of the manifest
-                                  type: string
-                              required:
-                              - expression
-                              type: object
+                              type: string
                             type: array
                           condition:
                             description: |-
diff --git a/work/v1/types.go b/work/v1/types.go
@@ -138,7 +138,7 @@ type ConditionRule struct {
 	// CelExpressions defines the CEL expressions to be evaluated for the condition.
 	// Final result is the logical AND of all expressions.
 	// +optional
-	CelExpressions []CelConditionExpressions `json:"celExpressions"`
+	CelExpressions []string `json:"celExpressions"`
 
 	// Message is set on the condition created for this rule
 	// +optional
@@ -165,18 +165,6 @@ const (
 	CelConditionExpressionsType ConditionRuleType = "CEL"
 )
 
-type CelConditionExpressions struct {
-	// Expression represents the CEL expression to be evaluated on the manifest.
-	// The expression must evaluate to a bool.
-	// If the expression evaluates to any other type, the condition's status will be False.
-	// Ref to https://kubernetes.io/docs/reference/using-api/cel/ on how to write CEL
-	// Variables:
-	// - object: The current instance of the manifest
-	// +kubebuilder:validation:Required
-	// +required
-	Expression string `json:"expression"`
-}
-
 // ManifestWorkExecutor is the executor that applies the resources to the managed cluster. i.e. the
 // work agent.
 type ManifestWorkExecutor struct {
diff --git a/work/v1/zz_generated.deepcopy.go b/work/v1/zz_generated.deepcopy.go
diff --git a/work/v1/zz_generated.swagger_doc_generated.go b/work/v1/zz_generated.swagger_doc_generated.go
diff --git a/work/v1alpha1/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml b/work/v1alpha1/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml
@@ -195,19 +195,7 @@ spec:
                                   CelExpressions defines the CEL expressions to be evaluated for the condition.
                                   Final result is the logical AND of all expressions.
                                 items:
-                                  properties:
-                                    expression:
-                                      description: |-
-                                        Expression represents the CEL expression to be evaluated on the manifest.
-                                        The expression must evaluate to a bool.
-                                        If the expression evaluates to any other type, the condition's status will be False.
-                                        Ref to https://kubernetes.io/docs/reference/using-api/cel/ on how to write CEL
-                                        Variables:
-                                        - object: The current instance of the manifest
-                                      type: string
-                                  required:
-                                  - expression
-                                  type: object
+                                  type: string
                                 type: array
                               condition:
                                 description: |-
