feat: add default engine in api (#485)

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
kyverno · Sep 18, 2024 · 87fe031 · 87fe031
1 parent 5e1c8d5
commit 87fe031
Show file tree

Hide file tree

Showing 14 changed files with 252 additions and 2 deletions.
diff --git a/.crds/json.kyverno.io_validatingpolicies.yaml b/.crds/json.kyverno.io_validatingpolicies.yaml
@@ -39,6 +39,13 @@ spec:
           spec:
             description: Policy spec.
             properties:
+              engine:
+                description: Engine defines the default engine to use when evaluating
+                  expressions.
+                enum:
+                - jp
+                - cel
+                type: string
               rules:
                 description: Rules is a list of ValidatingRule instances.
                 items:
@@ -57,6 +64,13 @@ spec:
                               check:
                                 description: Check is the assertion check definition.
                                 x-kubernetes-preserve-unknown-fields: true
+                              engine:
+                                description: Engine defines the default engine to
+                                  use when evaluating expressions.
+                                enum:
+                                - jp
+                                - cel
+                                type: string
                               message:
                                 description: Message is the message associated message.
                                 type: string
@@ -74,6 +88,13 @@ spec:
                               check:
                                 description: Check is the assertion check definition.
                                 x-kubernetes-preserve-unknown-fields: true
+                              engine:
+                                description: Engine defines the default engine to
+                                  use when evaluating expressions.
+                                enum:
+                                - jp
+                                - cel
+                                type: string
                               message:
                                 description: Message is the message associated message.
                                 type: string
@@ -99,6 +120,13 @@ spec:
                         - name
                         type: object
                       type: array
+                    engine:
+                      description: Engine defines the default engine to use when evaluating
+                        expressions.
+                      enum:
+                      - jp
+                      - cel
+                      type: string
                     exclude:
                       description: Exclude defines when this policy rule should not
                         be applied.

diff --git a/.schemas/json/_definitions.json b/.schemas/json/_definitions.json
@@ -17636,6 +17636,14 @@
             "rules"
           ],
           "properties": {
+            "engine": {
+              "description": "Engine defines the default engine to use when evaluating expressions.",
+              "type": "string",
+              "enum": [
+                "jp",
+                "cel"
+              ]
+            },
             "rules": {
               "description": "Rules is a list of ValidatingRule instances.",
               "type": "array",
@@ -17665,6 +17673,14 @@
                               "description": "Check is the assertion check definition.",
                               "x-kubernetes-preserve-unknown-fields": true
                             },
+                            "engine": {
+                              "description": "Engine defines the default engine to use when evaluating expressions.",
+                              "type": "string",
+                              "enum": [
+                                "jp",
+                                "cel"
+                              ]
+                            },
                             "message": {
                               "description": "Message is the message associated message.",
                               "type": "string"
@@ -17686,6 +17702,14 @@
                               "description": "Check is the assertion check definition.",
                               "x-kubernetes-preserve-unknown-fields": true
                             },
+                            "engine": {
+                              "description": "Engine defines the default engine to use when evaluating expressions.",
+                              "type": "string",
+                              "enum": [
+                                "jp",
+                                "cel"
+                              ]
+                            },
                             "message": {
                               "description": "Message is the message associated message.",
                               "type": "string"
@@ -17716,6 +17740,14 @@
                       }
                     }
                   },
+                  "engine": {
+                    "description": "Engine defines the default engine to use when evaluating expressions.",
+                    "type": "string",
+                    "enum": [
+                      "jp",
+                      "cel"
+                    ]
+                  },
                   "exclude": {
                     "description": "Exclude defines when this policy rule should not be applied.",
                     "type": "object",

diff --git a/.schemas/json/validatingpolicy-json-v1alpha1.json b/.schemas/json/validatingpolicy-json-v1alpha1.json
@@ -285,6 +285,17 @@
         "rules"
       ],
       "properties": {
+        "engine": {
+          "description": "Engine defines the default engine to use when evaluating expressions.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "enum": [
+            "jp",
+            "cel"
+          ]
+        },
         "rules": {
           "description": "Rules is a list of ValidatingRule instances.",
           "type": "array",
@@ -323,6 +334,17 @@
                           "description": "Check is the assertion check definition.",
                           "x-kubernetes-preserve-unknown-fields": true
                         },
+                        "engine": {
+                          "description": "Engine defines the default engine to use when evaluating expressions.",
+                          "type": [
+                            "string",
+                            "null"
+                          ],
+                          "enum": [
+                            "jp",
+                            "cel"
+                          ]
+                        },
                         "message": {
                           "description": "Message is the message associated message.",
                           "type": [
@@ -353,6 +375,17 @@
                           "description": "Check is the assertion check definition.",
                           "x-kubernetes-preserve-unknown-fields": true
                         },
+                        "engine": {
+                          "description": "Engine defines the default engine to use when evaluating expressions.",
+                          "type": [
+                            "string",
+                            "null"
+                          ],
+                          "enum": [
+                            "jp",
+                            "cel"
+                          ]
+                        },
                         "message": {
                           "description": "Message is the message associated message.",
                           "type": [
@@ -392,6 +425,17 @@
                   }
                 }
               },
+              "engine": {
+                "description": "Engine defines the default engine to use when evaluating expressions.",
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "enum": [
+                  "jp",
+                  "cel"
+                ]
+              },
               "exclude": {
                 "description": "Exclude defines when this policy rule should not be applied.",
                 "type": [

diff --git a/.schemas/json/validatingpolicylist-json-v1alpha1.json b/.schemas/json/validatingpolicylist-json-v1alpha1.json
@@ -308,6 +308,17 @@
               "rules"
             ],
             "properties": {
+              "engine": {
+                "description": "Engine defines the default engine to use when evaluating expressions.",
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "enum": [
+                  "jp",
+                  "cel"
+                ]
+              },
               "rules": {
                 "description": "Rules is a list of ValidatingRule instances.",
                 "type": "array",
@@ -346,6 +357,17 @@
                                 "description": "Check is the assertion check definition.",
                                 "x-kubernetes-preserve-unknown-fields": true
                               },
+                              "engine": {
+                                "description": "Engine defines the default engine to use when evaluating expressions.",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ],
+                                "enum": [
+                                  "jp",
+                                  "cel"
+                                ]
+                              },
                               "message": {
                                 "description": "Message is the message associated message.",
                                 "type": [
@@ -376,6 +398,17 @@
                                 "description": "Check is the assertion check definition.",
                                 "x-kubernetes-preserve-unknown-fields": true
                               },
+                              "engine": {
+                                "description": "Engine defines the default engine to use when evaluating expressions.",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ],
+                                "enum": [
+                                  "jp",
+                                  "cel"
+                                ]
+                              },
                               "message": {
                                 "description": "Message is the message associated message.",
                                 "type": [
@@ -415,6 +448,17 @@
                         }
                       }
                     },
+                    "engine": {
+                      "description": "Engine defines the default engine to use when evaluating expressions.",
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "enum": [
+                        "jp",
+                        "cel"
+                      ]
+                    },
                     "exclude": {
                       "description": "Exclude defines when this policy rule should not be applied.",
                       "type": [

diff --git a/.schemas/openapi/v2/schema.json b/.schemas/openapi/v2/schema.json
diff --git a/.schemas/openapi/v3/apis/json.kyverno.io/v1alpha1.json b/.schemas/openapi/v3/apis/json.kyverno.io/v1alpha1.json
diff --git a/charts/kyverno-json/templates/crds.yaml b/charts/kyverno-json/templates/crds.yaml
@@ -48,6 +48,13 @@ spec:
           spec:
             description: Policy spec.
             properties:
+              engine:
+                description: Engine defines the default engine to use when evaluating
+                  expressions.
+                enum:
+                - jp
+                - cel
+                type: string
               rules:
                 description: Rules is a list of ValidatingRule instances.
                 items:
@@ -66,6 +73,13 @@ spec:
                               check:
                                 description: Check is the assertion check definition.
                                 x-kubernetes-preserve-unknown-fields: true
+                              engine:
+                                description: Engine defines the default engine to
+                                  use when evaluating expressions.
+                                enum:
+                                - jp
+                                - cel
+                                type: string
                               message:
                                 description: Message is the message associated message.
                                 type: string
@@ -83,6 +97,13 @@ spec:
                               check:
                                 description: Check is the assertion check definition.
                                 x-kubernetes-preserve-unknown-fields: true
+                              engine:
+                                description: Engine defines the default engine to
+                                  use when evaluating expressions.
+                                enum:
+                                - jp
+                                - cel
+                                type: string
                               message:
                                 description: Message is the message associated message.
                                 type: string
@@ -108,6 +129,13 @@ spec:
                         - name
                         type: object
                       type: array
+                    engine:
+                      description: Engine defines the default engine to use when evaluating
+                        expressions.
+                      enum:
+                      - jp
+                      - cel
+                      type: string
                     exclude:
                       description: Exclude defines when this policy rule should not
                         be applied.

diff --git a/pkg/apis/policy/v1alpha1/assertion.go b/pkg/apis/policy/v1alpha1/assertion.go
@@ -6,6 +6,9 @@ type Assertion struct {
 	// +optional
 	Message string `json:"message,omitempty"`
 
+	// Engine defines the default engine to use when evaluating expressions.
+	Engine *Engine `json:"engine,omitempty"`
+
 	// Check is the assertion check definition.
 	Check AssertionTree `json:"check"`
 }
diff --git a/pkg/apis/policy/v1alpha1/engine.go b/pkg/apis/policy/v1alpha1/engine.go
@@ -0,0 +1,9 @@
+package v1alpha1
+
+// +kubebuilder:validation:Enum:=jp;cel
+type Engine string
+
+const (
+	EngineJP  Engine = "jp"
+	EngineCEL Engine = "cel"
+)
diff --git a/pkg/apis/policy/v1alpha1/validating_policy_spec.go b/pkg/apis/policy/v1alpha1/validating_policy_spec.go
@@ -2,6 +2,9 @@ package v1alpha1
 
 // ValidatingPolicySpec contains the policy spec.
 type ValidatingPolicySpec struct {
+	// Engine defines the default engine to use when evaluating expressions.
+	Engine *Engine `json:"engine,omitempty"`
+
 	// Rules is a list of ValidatingRule instances.
 	Rules []ValidatingRule `json:"rules"`
 }
diff --git a/pkg/apis/policy/v1alpha1/validating_rule.go b/pkg/apis/policy/v1alpha1/validating_rule.go
@@ -6,6 +6,9 @@ type ValidatingRule struct {
 	// +kubebuilder:validation:MaxLength=63
 	Name string `json:"name"`
 
+	// Engine defines the default engine to use when evaluating expressions.
+	Engine *Engine `json:"engine,omitempty"`
+
 	// Context defines variables and data sources that can be used during rule execution.
 	// +optional
 	Context []ContextEntry `json:"context,omitempty"`

diff --git a/pkg/apis/policy/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/policy/v1alpha1/zz_generated.deepcopy.go