feat:support default value into apiCall context variables (kyverno#10594

) * initial changes Signed-off-by: sivasathyaseeelan <[email protected]> * test changes Signed-off-by: sivasathyaseeelan <[email protected]> * logical changes Signed-off-by: sivasathyaseeelan <[email protected]> * added Check for default in transformAndStore Signed-off-by: sivasathyaseeelan <[email protected]> * codegen applied Signed-off-by: sivasathyaseeelan <[email protected]> * considered an edge case Signed-off-by: sivasathyaseeelan <[email protected]> * fix: remove error when jsondata and default is nil Signed-off-by: Vishal Choudhary <[email protected]> * codegen done Signed-off-by: sivasathyaseeelan <[email protected]> --------- Signed-off-by: sivasathyaseeelan <[email protected]> Signed-off-by: Vishal Choudhary <[email protected]> Co-authored-by: Vishal Choudhary <[email protected]> Co-authored-by: shuting <[email protected]>
realshuting · Sep 5, 2024 · cc966bf · cc966bf
1 parent b78c501
commit cc966bf
Show file tree

Hide file tree

Showing 25 changed files with 1,044 additions and 3 deletions.
diff --git a/api/kyverno/v1/common_types.go b/api/kyverno/v1/common_types.go
@@ -217,6 +217,11 @@ type APICall struct {
 type ContextAPICall struct {
 	APICall `json:",inline" yaml:",inline"`
 
+	// Default is an optional arbitrary JSON object that the context may take if the apiCall
+	// returns error
+	// +optional
+	Default *apiextv1.JSON `json:"default,omitempty" yaml:"default,omitempty"`
+
 	// JMESPath is an optional JSON Match Expression that can be used to
 	// transform the JSON response returned from the server. For example
 	// a JMESPath of "items | length(@)" applied to the API server response

diff --git a/api/kyverno/v1/zz_generated.deepcopy.go b/api/kyverno/v1/zz_generated.deepcopy.go
diff --git a/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_cleanuppolicies.yaml b/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_cleanuppolicies.yaml
@@ -192,6 +192,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to
@@ -1455,6 +1460,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to

diff --git a/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_clustercleanuppolicies.yaml b/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_clustercleanuppolicies.yaml
@@ -192,6 +192,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to
@@ -1455,6 +1460,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to

diff --git a/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_clusterpolicies.yaml b/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_clusterpolicies.yaml
diff --git a/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_policies.yaml b/charts/kyverno/charts/crds/templates/kyverno.io/kyverno.io_policies.yaml
diff --git a/cmd/cli/kubectl-kyverno/data/crds/kyverno.io_clusterpolicies.yaml b/cmd/cli/kubectl-kyverno/data/crds/kyverno.io_clusterpolicies.yaml
diff --git a/cmd/cli/kubectl-kyverno/data/crds/kyverno.io_policies.yaml b/cmd/cli/kubectl-kyverno/data/crds/kyverno.io_policies.yaml
diff --git a/config/crds/kyverno/kyverno.io_cleanuppolicies.yaml b/config/crds/kyverno/kyverno.io_cleanuppolicies.yaml
@@ -186,6 +186,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to
@@ -1449,6 +1454,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to

diff --git a/config/crds/kyverno/kyverno.io_clustercleanuppolicies.yaml b/config/crds/kyverno/kyverno.io_clustercleanuppolicies.yaml
@@ -186,6 +186,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to
@@ -1449,6 +1454,11 @@ spec:
                             - value
                             type: object
                           type: array
+                        default:
+                          description: |-
+                            Default is an optional arbitrary JSON object that the context may take if the apiCall
+                            returns error
+                          x-kubernetes-preserve-unknown-fields: true
                         jmesPath:
                           description: |-
                             JMESPath is an optional JSON Match Expression that can be used to