feat: add patch operation outputs support (#1076)

* feat: add patch operation outputs support Signed-off-by: Charles-Edouard Brétéché <[email protected]> * clean Signed-off-by: Charles-Edouard Brétéché <[email protected]> --------- Signed-off-by: Charles-Edouard Brétéché <[email protected]>
kyverno · Mar 7, 2024 · 0c9194b · 0c9194b
1 parent 3e39a5d
commit 0c9194b
Show file tree

Hide file tree

Showing 20 changed files with 238 additions and 35 deletions.
diff --git a/.crds/chainsaw.kyverno.io_tests.yaml b/.crds/chainsaw.kyverno.io_tests.yaml
@@ -2056,6 +2056,28 @@ spec:
                                   that matches multiple files, such as "manifest/*.yaml"
                                   for all YAML files within the "manifest" directory.
                                 type: string
+                              outputs:
+                                description: Outputs defines output bindings.
+                                items:
+                                  description: Output represents an output binding
+                                    with a match to determine if the binding must
+                                    be considered or not.
+                                  properties:
+                                    match:
+                                      description: Match defines the matching statement.
+                                      type: object
+                                      x-kubernetes-preserve-unknown-fields: true
+                                    name:
+                                      description: Name the name of the binding.
+                                      type: string
+                                    value:
+                                      description: Value value of the binding.
+                                      x-kubernetes-preserve-unknown-fields: true
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
                               resource:
                                 description: Resource provides a resource to be applied.
                                 type: object

diff --git a/.crds/chainsaw.kyverno.io_teststeps.yaml b/.crds/chainsaw.kyverno.io_teststeps.yaml
@@ -1490,6 +1490,28 @@ spec:
                             multiple files, such as "manifest/*.yaml" for all YAML
                             files within the "manifest" directory.
                           type: string
+                        outputs:
+                          description: Outputs defines output bindings.
+                          items:
+                            description: Output represents an output binding with
+                              a match to determine if the binding must be considered
+                              or not.
+                            properties:
+                              match:
+                                description: Match defines the matching statement.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              name:
+                                description: Name the name of the binding.
+                                type: string
+                              value:
+                                description: Value value of the binding.
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
                         resource:
                           description: Resource provides a resource to be applied.
                           type: object

diff --git a/.schemas/json/test-chainsaw-v1alpha1.json b/.schemas/json/test-chainsaw-v1alpha1.json
@@ -3689,6 +3689,38 @@
                             "null"
                           ]
                         },
+                        "outputs": {
+                          "description": "Outputs defines output bindings.",
+                          "type": [
+                            "array",
+                            "null"
+                          ],
+                          "items": {
+                            "description": "Output represents an output binding with a match to determine if the binding must be considered or not.",
+                            "type": [
+                              "object",
+                              "null"
+                            ],
+                            "required": [
+                              "name",
+                              "value"
+                            ],
+                            "properties": {
+                              "match": {
+                                "description": "Match defines the matching statement.",
+                                "x-kubernetes-preserve-unknown-fields": true
+                              },
+                              "name": {
+                                "description": "Name the name of the binding.",
+                                "type": "string"
+                              },
+                              "value": {
+                                "description": "Value value of the binding.",
+                                "x-kubernetes-preserve-unknown-fields": true
+                              }
+                            }
+                          }
+                        },
                         "resource": {
                           "description": "Resource provides a resource to be applied.",
                           "x-kubernetes-embedded-resource": true,

diff --git a/pkg/apis/v1alpha1/patch.go b/pkg/apis/v1alpha1/patch.go
@@ -15,6 +15,10 @@ type Patch struct {
 	// +optional
 	Bindings []Binding `json:"bindings,omitempty"`
 
+	// Outputs defines output bindings.
+	// +optional
+	Outputs []Output `json:"outputs,omitempty"`
+
 	// Cluster defines the target cluster (default cluster will be used if not specified and/or overridden).
 	// +optional
 	Cluster string `json:"cluster,omitempty"`

diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/data/crds/chainsaw.kyverno.io_tests.yaml b/pkg/data/crds/chainsaw.kyverno.io_tests.yaml
@@ -2056,6 +2056,28 @@ spec:
                                   that matches multiple files, such as "manifest/*.yaml"
                                   for all YAML files within the "manifest" directory.
                                 type: string
+                              outputs:
+                                description: Outputs defines output bindings.
+                                items:
+                                  description: Output represents an output binding
+                                    with a match to determine if the binding must
+                                    be considered or not.
+                                  properties:
+                                    match:
+                                      description: Match defines the matching statement.
+                                      type: object
+                                      x-kubernetes-preserve-unknown-fields: true
+                                    name:
+                                      description: Name the name of the binding.
+                                      type: string
+                                    value:
+                                      description: Value value of the binding.
+                                      x-kubernetes-preserve-unknown-fields: true
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
                               resource:
                                 description: Resource provides a resource to be applied.
                                 type: object

diff --git a/pkg/data/crds/chainsaw.kyverno.io_teststeps.yaml b/pkg/data/crds/chainsaw.kyverno.io_teststeps.yaml
@@ -1490,6 +1490,28 @@ spec:
                             multiple files, such as "manifest/*.yaml" for all YAML
                             files within the "manifest" directory.
                           type: string
+                        outputs:
+                          description: Outputs defines output bindings.
+                          items:
+                            description: Output represents an output binding with
+                              a match to determine if the binding must be considered
+                              or not.
+                            properties:
+                              match:
+                                description: Match defines the matching statement.
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
+                              name:
+                                description: Name the name of the binding.
+                                type: string
+                              value:
+                                description: Value value of the binding.
+                                x-kubernetes-preserve-unknown-fields: true
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
                         resource:
                           description: Resource provides a resource to be applied.
                           type: object

diff --git a/pkg/data/schemas/json/test-chainsaw-v1alpha1.json b/pkg/data/schemas/json/test-chainsaw-v1alpha1.json
@@ -3689,6 +3689,38 @@
                             "null"
                           ]
                         },
+                        "outputs": {
+                          "description": "Outputs defines output bindings.",
+                          "type": [
+                            "array",
+                            "null"
+                          ],
+                          "items": {
+                            "description": "Output represents an output binding with a match to determine if the binding must be considered or not.",
+                            "type": [
+                              "object",
+                              "null"
+                            ],
+                            "required": [
+                              "name",
+                              "value"
+                            ],
+                            "properties": {
+                              "match": {
+                                "description": "Match defines the matching statement.",
+                                "x-kubernetes-preserve-unknown-fields": true
+                              },
+                              "name": {
+                                "description": "Name the name of the binding.",
+                                "type": "string"
+                              },
+                              "value": {
+                                "description": "Value value of the binding.",
+                                "x-kubernetes-preserve-unknown-fields": true
+                              }
+                            }
+                          }
+                        },
                         "resource": {
                           "description": "Resource provides a resource to be applied.",
                           "x-kubernetes-embedded-resource": true,

diff --git a/pkg/runner/operations/apply/operation.go b/pkg/runner/operations/apply/operation.go
@@ -54,14 +54,14 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}
 	obj := o.base
 	logger := internal.GetLogger(ctx, &obj)
 	defer func() {
-		internal.LogEnd(logger, logging.Apply, err)
+		internal.LogEnd(logger, logging.Apply, _err)
 	}()
 	if o.template {
 		template := v1alpha1.Any{

diff --git a/pkg/runner/operations/assert/operation.go b/pkg/runner/operations/assert/operation.go
@@ -41,14 +41,14 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (outputs operations.Outputs, err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}
 	obj := o.base
 	logger := internal.GetLogger(ctx, &obj)
 	defer func() {
-		internal.LogEnd(logger, logging.Assert, err)
+		internal.LogEnd(logger, logging.Assert, _err)
 	}()
 	if o.template {
 		if err := template.ResourceRef(ctx, &obj, bindings); err != nil {

diff --git a/pkg/runner/operations/command/operation.go b/pkg/runner/operations/command/operation.go
@@ -42,7 +42,7 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (outputs operations.Outputs, _err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}

diff --git a/pkg/runner/operations/create/operation.go b/pkg/runner/operations/create/operation.go
@@ -52,14 +52,14 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}
 	obj := o.base
 	logger := internal.GetLogger(ctx, &obj)
 	defer func() {
-		internal.LogEnd(logger, logging.Create, err)
+		internal.LogEnd(logger, logging.Create, _err)
 	}()
 	if o.template {
 		template := v1alpha1.Any{

diff --git a/pkg/runner/operations/delete/operation.go b/pkg/runner/operations/delete/operation.go
@@ -42,14 +42,14 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (outputs operations.Outputs, err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}
 	obj := o.base
 	logger := internal.GetLogger(ctx, &obj)
 	defer func() {
-		internal.LogEnd(logger, logging.Delete, err)
+		internal.LogEnd(logger, logging.Delete, _err)
 	}()
 	if o.template {
 		template := v1alpha1.Any{

diff --git a/pkg/runner/operations/error/operation.go b/pkg/runner/operations/error/operation.go
@@ -40,14 +40,14 @@ func New(
 	}
 }
 
-func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (outputs operations.Outputs, err error) {
+func (o *operation) Exec(ctx context.Context, bindings binding.Bindings) (_ operations.Outputs, _err error) {
 	if bindings == nil {
 		bindings = binding.NewBindings()
 	}
 	obj := o.base
 	logger := internal.GetLogger(ctx, &obj)
 	defer func() {
-		internal.LogEnd(logger, logging.Error, err)
+		internal.LogEnd(logger, logging.Error, _err)
 	}()
 	if o.template {
 		if err := template.ResourceRef(ctx, &obj, bindings); err != nil {