Support CEL for matchExpressions

kustomize/crd/bases/kwok.x-k8s.io_stages.yaml

@@ -232,13 +232,16 @@ spec:
                     description: MatchExpressions is a list of label selector requirements.
                       The requirements are ANDed.
                     items:
-                      description: |-
-                        SelectorRequirement is a resource selector requirement is a selector that contains values, a key,
-                        and an operator that relates the key and values.
+                      description: SelectorExpression is a resource selector expression
+                        is a set of requirements that must be true for a match.
                       properties:
+                        expression:
+                          description: Expression represents the expression which
+                            will be evaluated by CEL.
+                          type: string
                         key:
-                          description: The name of the scope that the selector applies
-                            to.
+                          description: Key represents the expression which will be
+                            evaluated by JQ.
                           type: string
                         operator:
                           description: Represents a scope's relationship to a set
@@ -252,10 +255,12 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - key
-                      - operator
                       type: object
+                      x-kubernetes-validations:
+                      - message: expression and key are mutually exclusive
+                        rule: has(self.expression) != has(self.key)
+                      - message: key and operator must be set together
+                        rule: has(self.key) && has(self.operator)
                     type: array
                   matchLabels:
                     additionalProperties:

pkg/apis/internalversion/cel_types.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package internalversion
+
+// ExpressionCEL is the expression which will be evaluated by CEL.
+type ExpressionCEL struct {
+	// Expression represents the expression which will be evaluated by CEL.
+	Expression string
+}

pkg/apis/internalversion/stage_types.go

@@ -163,13 +163,19 @@ type StageSelector struct {
 	// operator is "In", and the values array contains only "value". The requirements are ANDed.
 	MatchAnnotations map[string]string
 	// MatchExpressions is a list of label selector requirements. The requirements are ANDed.
-	MatchExpressions []SelectorRequirement
+	MatchExpressions []SelectorExpression
 }
 
-// SelectorRequirement is a resource selector requirement is a selector that contains values, a key,
+// SelectorExpression is a resource selector expression is a set of requirements that must be true for a match.
+type SelectorExpression struct {
+	*ExpressionCEL
+	*SelectorJQ
+}
+
+// SelectorJQ is a resource selector requirement is a selector that contains values, a key,
 // and an operator that relates the key and values.
-type SelectorRequirement struct {
-	// The name of the scope that the selector applies to.
+type SelectorJQ struct {
+	// Key represents the expression which will be evaluated by JQ.
 	Key string
 	// Represents a scope's relationship to a set of values.
 	Operator SelectorOperator

pkg/apis/v1alpha1/cel_types.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+// ExpressionCEL is the expression which will be evaluated by CEL.
+type ExpressionCEL struct {
+	// Expression represents the expression which will be evaluated by CEL.
+	Expression string `json:"expression,omitempty"`
+}

pkg/apis/v1alpha1/stage_types.go

@@ -218,16 +218,24 @@ type StageSelector struct {
 	// operator is "In", and the values array contains only "value". The requirements are ANDed.
 	MatchAnnotations map[string]string `json:"matchAnnotations,omitempty"`
 	// MatchExpressions is a list of label selector requirements. The requirements are ANDed.
-	MatchExpressions []SelectorRequirement `json:"matchExpressions,omitempty"`
+	MatchExpressions []SelectorExpression `json:"matchExpressions,omitempty"`
 }
 
-// SelectorRequirement is a resource selector requirement is a selector that contains values, a key,
+// SelectorExpression is a resource selector expression is a set of requirements that must be true for a match.
+// +kubebuilder:validation:XValidation:rule="has(self.expression) != has(self.key)",message="expression and key are mutually exclusive"
+// +kubebuilder:validation:XValidation:rule="has(self.key) && has(self.operator)",message="key and operator must be set together"
+type SelectorExpression struct {
+	*ExpressionCEL `json:",inline"`
+	*SelectorJQ    `json:",inline"`
+}
+
+// SelectorJQ is a resource selector requirement is a selector that contains values, a key,
 // and an operator that relates the key and values.
-type SelectorRequirement struct {
-	// The name of the scope that the selector applies to.
-	Key string `json:"key"`
+type SelectorJQ struct {
+	// Key represents the expression which will be evaluated by JQ.
+	Key string `json:"key,omitempty"`
 	// Represents a scope's relationship to a set of values.
-	Operator SelectorOperator `json:"operator"`
+	Operator SelectorOperator `json:"operator,omitempty"`
 	// An array of string values.
 	// If the operator is In, NotIn, Intersection or NotIntersection, the values array must be non-empty.
 	// If the operator is Exists or DoesNotExist, the values array must be empty.