Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kuttl for openSUSE:Factory checked in at 2026-11-20 14:47:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kuttl (Old) and /work/SRC/openSUSE:Factory/.kuttl.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kuttl" Fri Nov 20 14:47:40 2026 rev:11 rq:1398875 version:0.29.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kuttl/kuttl.changes 2026-10-24 22:05:33.197929285 +0200 +++ /work/SRC/openSUSE:Factory/.kuttl.new.1251/kuttl.changes 2026-11-20 14:50:23.641693291 +0100 @@ -1,0 +2,13 @@ +Fri Nov 20 05:38:15 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 0.29.0: + * Highlights + - feat: add test case preCleanup commands (#739) + * Dependency bumps + - chore(deps): bump go.opentelemetry.io/otel/trace from 1.44.0 + to 1.47.0 (#742) + - chore(deps): bump github.com/spf13/pflag from 1.0.10 to 1.1.0 + (#741) + - chore(deps): bump the kubernetes group with 5 updates (#740) + +------------------------------------------------------------------- Old: ---- kuttl-0.28.0.obscpio New: ---- kuttl-0.29.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kuttl.spec ++++++ --- /var/tmp/diff_new_pack.bw0pFa/_old 2026-11-20 14:50:25.519772792 +0100 +++ /var/tmp/diff_new_pack.bw0pFa/_new 2026-11-20 14:50:25.524773004 +0100 @@ -19,7 +19,7 @@ %define executable_name kubectl-kuttl Name: kuttl -Version: 0.28.0 +Version: 0.29.0 Release: 0 Summary: KUbernetes Test TooL License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bw0pFa/_old 2026-11-20 14:50:25.612776729 +0100 +++ /var/tmp/diff_new_pack.bw0pFa/_new 2026-11-20 14:50:25.618776983 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/kudobuilder/kuttl.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">refs/tags/v0.28.0</param> + <param name="revision">refs/tags/v0.29.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.bw0pFa/_old 2026-11-20 14:50:25.674779354 +0100 +++ /var/tmp/diff_new_pack.bw0pFa/_new 2026-11-20 14:50:25.679779566 +0100 @@ -3,6 +3,6 @@ <param name="url">https://github.com/kudobuilder/kuttl</param> <param name="changesrevision">65e2c699b69c63ec182de0566a04cd87f6bcbe0d</param></service><service name="tar_scm"> <param name="url">https://github.com/kudobuilder/kuttl.git</param> - <param name="changesrevision">2635740569a28f83f8fe1dc8e722017a6e02be69</param></service></servicedata> + <param name="changesrevision">0ec8b556b2f405933940f7ed463b1ada0cf12df7</param></service></servicedata> (No newline at EOF) ++++++ kuttl-0.28.0.obscpio -> kuttl-0.29.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/docs/kuttl-test-harness.md new/kuttl-0.29.0/docs/kuttl-test-harness.md --- old/kuttl-0.28.0/docs/kuttl-test-harness.md 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/docs/kuttl-test-harness.md 2026-11-16 08:16:51.000000000 +0100 @@ -167,6 +167,42 @@ See the [TestCase reference](testing/reference.md#testcase) for the full list of supported settings. +### Cleaning Up Resources Before Namespace Deletion + +By default, subject to the [suite delete setting](testing/reference.md#testsuite), KUTTL deletes the test namespace after a test case finishes, which removes all namespaced resources. + +Custom cleanup may be needed when a test case: +- fails because of a logic error or a misbehaving controller, +- creates cluster-scoped or external resources. + +If you define `preCleanup` commands on the test case's [TestCase](testing/reference.md#testcase) object, KUTTL runs these commands after the test case finishes and before namespace cleanup. + +Create `tests/e2e/example-test/00-test-case.yaml`: + +```yaml +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- script: kubectl delete clusterrole example-role --ignore-not-found=true +``` + +Each command receives these environment variables: + +| Environment variable | Description | +| ---------------------------- | ---------------------------------------------------------------- | +| `KUTTL_TEST_CASE_FAILED` | `true` if the test case failed; otherwise `false`. | +| `KUTTL_TEST_CASE_NAME` | Name of the test case. | +| `KUTTL_TEST_CASE_STEP_NAME` | Name of the last step attempted. Empty if no step was attempted. | +| `KUTTL_TEST_CASE_STEP_INDEX` | Index of the last step attempted. `-1` if no step was attempted. | + +Scripts and commands can use these variables to determine how far the test case progressed and whether it passed or failed. +For example, a shell script can run a different cleanup path when `KUTTL_TEST_CASE_FAILED` is `true`. + +The `preCleanup` commands must finish before namespace cleanup. +If a command or script fails, the whole test case fails unless `ignoreFailure` is set to `true`. +If `background` is set to `true`, KUTTL logs a warning and runs the command in the foreground instead. +See the [Command reference](testing/reference.md#commands) for the complete command schema. + ### Test Suite Configuration To add this test suite to your project, create a `kuttl-test.yaml` file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/docs/testing/reference.md new/kuttl-0.29.0/docs/testing/reference.md --- old/kuttl-0.28.0/docs/testing/reference.md 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/docs/testing/reference.md 2026-11-16 08:16:51.000000000 +0100 @@ -172,13 +172,16 @@ values: - lemon - orange +preCleanup: +- script: kubectl delete resource --all ``` Supported settings: -| Field | Type | Description | Default | -|-----------------|----------------|---------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| -| testRunSelector | label selector | If this selector does not match [labels of this test run](#test-run-labels-and-selectors), the test case will be skipped. | Empty label selector (matches all possible test label sets). | +| Field | Type | Description | Default | +| --------------- | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ | +| testRunSelector | label selector | If this selector does not match [labels of this test run](#test-run-labels-and-selectors), the test case will be skipped. | Empty label selector (matches all possible test label sets). | +| preCleanup | list of [Commands](#commands) | Commands to run after the test case finishes and before namespace cleanup. See the [preCleanup guide](../kuttl-test-harness.md#cleaning-up-resources-before-namespace-deletion) for environment variables and failure handling. | [] | ## Collectors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/go.mod new/kuttl-0.29.0/go.mod --- old/kuttl-0.28.0/go.mod 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/go.mod 2026-11-16 08:16:51.000000000 +0100 @@ -14,16 +14,16 @@ github.com/moby/moby/client v0.6.2 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 github.com/spf13/cobra v1.10.2 - github.com/spf13/pflag v1.0.10 + github.com/spf13/pflag v1.1.0 github.com/stretchr/testify v1.12.1 github.com/thoas/go-funk v0.9.3 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.37.1 - k8s.io/apiextensions-apiserver v0.37.1 - k8s.io/apimachinery v0.37.1 - k8s.io/client-go v0.37.1 - k8s.io/code-generator v0.37.1 + k8s.io/api v0.37.2 + k8s.io/apiextensions-apiserver v0.37.2 + k8s.io/apimachinery v0.37.2 + k8s.io/client-go v0.37.2 + k8s.io/code-generator v0.37.2 sigs.k8s.io/controller-runtime v0.25.2 sigs.k8s.io/controller-tools v0.23.0 sigs.k8s.io/kind v0.33.0 @@ -95,9 +95,10 @@ github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect - go.opentelemetry.io/otel v1.44.0 // indirect - go.opentelemetry.io/otel/metric v1.44.0 // indirect - go.opentelemetry.io/otel/trace v1.44.0 // indirect + go.opentelemetry.io/otel v1.47.0 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect + go.opentelemetry.io/otel/metric v1.47.0 // indirect + go.opentelemetry.io/otel/trace v1.47.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/go.sum new/kuttl-0.29.0/go.sum --- old/kuttl-0.28.0/go.sum 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/go.sum 2026-11-16 08:16:51.000000000 +0100 @@ -192,8 +192,8 @@ github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= -github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.1.0 h1:6W6MbVUrnMb8PEhjkqwsVLY7ryuzRfFHF4mQd7L94ag= +github.com/spf13/pflag v1.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -214,20 +214,22 @@ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI= -go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= -go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM= +go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 h1:4YsVu3B8+3qtWYYrsUYgn0OG78pN0rnNPRGX4SbokQI= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0/go.mod h1:+wnlSn0mD1ADVMe3v9Z/WIaiz6q6gL2J/ejaAmdmv80= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 h1:qazEJlUOQzhCpzQpFETGby7EdqjI1wsd0W+6Gg1SCTU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0/go.mod h1:fOD2Yefuxixkx3ahVNf0O/PERb6r4OlbxfATVnYvzCo= -go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= -go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI= +go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw= +go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY= +go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU= go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= -go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= -go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM= +go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0= go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -293,20 +295,20 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= -k8s.io/api v0.37.1 h1:l6N77U7tjwB5L056bgrBTJIEdevac/naBZ3iSvDNfpM= -k8s.io/api v0.37.1/go.mod h1:zSlbB1YpJ1YQlFVQy20UYll81UJSJJUMLhkhvg6Z78M= -k8s.io/apiextensions-apiserver v0.37.1 h1:7fIQG8eThDSTVYBWg/DOpI8v5wYfKCo0N8/TDMjj+zY= -k8s.io/apiextensions-apiserver v0.37.1/go.mod h1:1Q3ujWwHgnhBoGsdmGORflwK1sDFmuaqH1OsMDWk2Gs= -k8s.io/apimachinery v0.37.1 h1:hGCYyvKHCwtwMitj2vU4vYx0Z16N9GyZk9BBnz0wDAE= -k8s.io/apimachinery v0.37.1/go.mod h1:jF84AyUi/IRIXRot5f+lm6MpxoWI+F1XgjaMmwCdTFw= -k8s.io/apiserver v0.37.1 h1:dUsNwjsvItyVKNpC1N0AhQ0OBSiUJKfWz004vPifOe0= -k8s.io/apiserver v0.37.1/go.mod h1:EWXW6PntGfOC2uD9GGVobnOExgFoX1z0hZo7f7Rs7Ng= -k8s.io/client-go v0.37.1 h1:QTv/5ha4jAHtW9qxxVBkQVFBRDb4jHfFopQqqMdc+wM= -k8s.io/client-go v0.37.1/go.mod h1:dnAPtTnCNY38Ho04D2KdY1F4IKausa9UbqaAZKl60SY= -k8s.io/code-generator v0.37.1 h1:tvxxAiGc2kMxoGx8HtUacs4cBdl0X5R+auBD2He974U= -k8s.io/code-generator v0.37.1/go.mod h1:RJepz1uW2WnHEwPDoCGzI3p4V23C7WuUdtqjueDl1uU= -k8s.io/component-base v0.37.1 h1:93DMmlENnK7gNLkL4pMqLO5M/HVf3p3sM4q/GasLveY= -k8s.io/component-base v0.37.1/go.mod h1:bBrdziT4dreQG5lzTaPVxBwsZe1oxphG+ZVdD56dQWQ= +k8s.io/api v0.37.2 h1:PnxqnUFy93jr2GcpWDkKOm8wfy25kT9wa572MuQS8oc= +k8s.io/api v0.37.2/go.mod h1:+NVRLft99kx+Jg9v34GmHw867Dapim89TSyCsn2hK+M= +k8s.io/apiextensions-apiserver v0.37.2 h1:myaUiAlm1NRLYdpAvWYTqdgeiCepFupJiRFVVueMUYw= +k8s.io/apiextensions-apiserver v0.37.2/go.mod h1:BFl1aPC89HsgFgYI+3xpFtckvkAeenDTZP84njA9yw4= +k8s.io/apimachinery v0.37.2 h1:G4t9RGoPDbQML38hz/kQQiltttgd3egg2ODCR8aIc2o= +k8s.io/apimachinery v0.37.2/go.mod h1:qaAvSNvgU2x07wRM95MSHSJTPQ/ob/LeNAGbeDgqQJg= +k8s.io/apiserver v0.37.2 h1:9Jq73PeHAA0RThpW7ou6lBcO2+SxLcPrAgleONSMUNQ= +k8s.io/apiserver v0.37.2/go.mod h1:d0P4WZtt6XMYAo6VN8dDPRnvY3O34quI3pOuxtfgAgM= +k8s.io/client-go v0.37.2 h1:sgFtyRZukGkOrsu+QgS7LYnbFFJ5ut3MchdBNduD//E= +k8s.io/client-go v0.37.2/go.mod h1:bo3LFC8YbCtKFPX21Yj8puMsoJLAv/+SvuOODma0s54= +k8s.io/code-generator v0.37.2 h1:wfx7G5OkCTJktFu7HkEDTEa6iBYr3RMi2TTC3LBLfOE= +k8s.io/code-generator v0.37.2/go.mod h1:k24CS91bM7Kk5b776drjJYvvfLT5vceiLeOzTxNsEUc= +k8s.io/component-base v0.37.2 h1:Ia9IKTg1yWrUntJU5lVetapkC9pXlLg9L6P3R1IkbcY= +k8s.io/component-base v0.37.2/go.mod h1:qq+ueHZyLfzRJzxyDoyxHWNhF1JPv4zm3hcaddXWDvY= k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3 h1:3L6PNkMLXkU/pz3jWzaaIUz0Rs2V9h+5O51AeRC7poc= k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3/go.mod h1:yvyl3l9E+UxlqOMUULdKTAYB0rEhsmjr7+2Vb/1pCSo= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/harness/harness.go new/kuttl-0.29.0/internal/harness/harness.go --- old/kuttl-0.28.0/internal/harness/harness.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/harness/harness.go 2026-11-16 08:16:51.000000000 +0100 @@ -534,7 +534,7 @@ h.fatal(fmt.Errorf("fatal error installing manifests: %v", err)) } } - bgs, err := testutils.RunCommands(context.TODO(), h.GetLogger(), "default", h.TestSuite.Commands, "", h.TestSuite.Timeout, "") + bgs, err := testutils.RunCommands(context.TODO(), h.GetLogger(), "default", h.TestSuite.Commands, "", h.TestSuite.Timeout, "", nil) // assign any background processes first for cleanup in case of any errors h.bgProcesses = append(h.bgProcesses, bgs...) if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/step/step.go new/kuttl-0.29.0/internal/step/step.go --- old/kuttl-0.28.0/internal/step/step.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/step/step.go 2026-11-16 08:16:51.000000000 +0100 @@ -485,7 +485,7 @@ command.Background = false } } - if _, err := testutils.RunCommands(context.TODO(), s.Logger, namespace, s.Step.Commands, s.Dir, s.Timeout, s.Kubeconfig); err != nil { + if _, err := testutils.RunCommands(context.TODO(), s.Logger, namespace, s.Step.Commands, s.Dir, s.Timeout, s.Kubeconfig, nil); err != nil { testErrors = append(testErrors, err) } } @@ -533,7 +533,7 @@ s.Logger.Log("skipping invalid assertion collector") continue } - _, err := testutils.RunCommand(context.TODO(), namespace, *collector.Command(), s.Dir, s.Logger, s.Logger, s.Logger, s.Timeout, s.Kubeconfig) + _, err := testutils.RunCommand(context.TODO(), namespace, *collector.Command(), s.Dir, s.Logger, s.Logger, s.Logger, s.Timeout, s.Kubeconfig, nil) if err != nil { s.Logger.Log("step collector failure: %s", err) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/case.go new/kuttl-0.29.0/internal/testcase/case.go --- old/kuttl-0.28.0/internal/testcase/case.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/testcase/case.go 2026-11-16 08:16:51.000000000 +0100 @@ -7,6 +7,7 @@ "fmt" "path/filepath" "sort" + "strconv" "testing" "time" @@ -34,6 +35,13 @@ var errMoreThanOneTestCaseObject = errors.New("more than one TestCase object found") +const ( + envTestCaseFailed = "KUTTL_TEST_CASE_FAILED" + envTestCaseName = "KUTTL_TEST_CASE_NAME" + envTestCaseStepName = "KUTTL_TEST_CASE_STEP_NAME" + envTestCaseStepIndex = "KUTTL_TEST_CASE_STEP_INDEX" +) + type getClientFuncType func(forceNew bool) (client.Client, error) type getDiscoveryClientFuncType func() (discovery.DiscoveryInterface, error) @@ -135,6 +143,7 @@ getClient getClientFuncType getDiscoveryClient getDiscoveryClientFuncType failed bool + preCleanup []v1beta1.Command logger testutils.Logger // List of log types which should be suppressed. @@ -326,6 +335,11 @@ t.Skipf("test case skipped because test run selector %q does not match test run labels %q", c.runSelector, c.runLabels) } + var currentStep *step.Step + defer func() { + c.runPreCleanup(t, rep, currentStep) + }() + setupReport := rep.Step("setup") if err := c.setup(t); err != nil { c.failed = true @@ -334,6 +348,7 @@ } for _, testStep := range c.steps { + currentStep = testStep stepReport := rep.Step("step " + testStep.String()) testStep.Setup(c.logger, c.getClient, c.getDiscoveryClient) stepReport.AddAssertions(len(testStep.Asserts)) @@ -372,6 +387,52 @@ c.maybeReportEvents() } +func (c *Case) runPreCleanup(t T, rep report.TestReporter, currentStep *step.Step) { + if len(c.preCleanup) == 0 { + return + } + + // If the test case times out, its context is canceled and preCleanup commands may not complete. + // TODO: add a separate timeout setting to allow cleanup to complete. + ctx := t.Context() + if c.timeout > 0 { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, time.Duration(c.timeout)*time.Second) + defer cancel() + } + + var stepName string + stepIndex := -1 + if currentStep != nil { + stepName = currentStep.Name + stepIndex = currentStep.Index + } + + env := map[string]string{ + envTestCaseFailed: strconv.FormatBool(c.failed), + envTestCaseName: c.name, + envTestCaseStepName: stepName, + envTestCaseStepIndex: strconv.Itoa(stepIndex), + } + + for i := range c.preCleanup { + if c.preCleanup[i].Background { + c.logger.Log("background commands are not allowed for preCleanup and will be run in foreground") + c.preCleanup[i].Background = false + } + } + + if _, err := testutils.RunCommands(ctx, c.logger, c.ns.name, c.preCleanup, c.dir, c.timeout, "", env); err != nil { + preCleanupErr := fmt.Errorf("preCleanup failed: %w", err) + c.failed = true + t.Error(preCleanupErr) + if rep != nil { + preCleanupReport := rep.Step("preCleanup") + preCleanupReport.Failure(preCleanupErr.Error()) + } + } +} + func (c *Case) setup(t *testing.T) error { //nolint:thelper // sets up the case and reports via t; not an assertion helper clients, err := c.getEagerClients() if err != nil { @@ -481,6 +542,10 @@ c.steps = testSteps + if testCase != nil { + c.preCleanup = testCase.PreCleanup + } + return c.setRunSelector(testCase) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/case_test.go new/kuttl-0.29.0/internal/testcase/case_test.go --- old/kuttl-0.28.0/internal/testcase/case_test.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/testcase/case_test.go 2026-11-16 08:16:51.000000000 +0100 @@ -3,6 +3,9 @@ import ( "context" "fmt" + "os" + "path/filepath" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -18,6 +21,7 @@ "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/kudobuilder/kuttl/internal/kubernetes" + "github.com/kudobuilder/kuttl/internal/report" "github.com/kudobuilder/kuttl/internal/step" testutils "github.com/kudobuilder/kuttl/internal/utils" harness "github.com/kudobuilder/kuttl/pkg/apis/testharness/v1beta1" @@ -744,6 +748,111 @@ } } +func TestLoadTestStepsPreCleanup(t *testing.T) { + testCase := NewCase("loading", "test_data/pre-cleanup") + testCase.SetLogger(testutils.NewTestLogger(t, "")) + require.NoError(t, testCase.LoadTestSteps()) + + assert.Equal(t, []harness.Command{{Script: "cleanup-resource"}}, testCase.preCleanup) +} + +func TestRunPreCleanupEnvironment(t *testing.T) { + outputPath := filepath.Join(t.TempDir(), "pre-cleanup-env") + t.Setenv("KUTTL_PRE_CLEANUP_OUTPUT", outputPath) + + testCase := NewCase("environment", "test_data/pre-cleanup") + testCase.SetLogger(testutils.NewTestLogger(t, "")) + require.NoError(t, testCase.LoadTestSteps()) + + testCase.failed = true + + currentStep := &step.Step{ + Name: "failing-step", + Index: 2, + } + + testCase.runPreCleanup(t, nil, currentStep) + + contents, err := os.ReadFile(outputPath) + require.NoError(t, err) + assert.Equal(t, []string{"true", "environment", "failing-step", "2"}, strings.Split(strings.TrimSpace(string(contents)), "\n")) +} + +func TestRunPreCleanupFailure(t *testing.T) { + testCase := NewCase("failure", "test_data/pre-cleanup") + testCase.SetLogger(testutils.NewTestLogger(t, "")) + require.NoError(t, testCase.LoadTestSteps()) + + test := &testMock{} + reporter := &preCleanupReporter{} + testCase.runPreCleanup(test, reporter, nil) + + assert.True(t, testCase.failed) + require.Len(t, test.testErrors, 1) + require.Len(t, test.testErrors[0], 1) + preCleanupErr, ok := test.testErrors[0][0].(error) + require.True(t, ok) + assert.Contains(t, preCleanupErr.Error(), "preCleanup failed") + assert.Equal(t, "preCleanup", reporter.stepName) + assert.Contains(t, reporter.failure, "preCleanup failed") +} + +func TestRunPreCleanupBeforeNamespaceCleanup(t *testing.T) { + var events []string + + outputPath := filepath.Join(t.TempDir(), "pre-cleanup") + t.Setenv("KUTTL_PRE_CLEANUP_OUTPUT", outputPath) + + testCase := NewCase("ordering", "test_data/pre-cleanup") + testCase.SetLogger(testutils.NewTestLogger(t, "")) + require.NoError(t, testCase.LoadTestSteps()) + + t.Run("cleanup order", func(t *testing.T) { + t.Cleanup(func() { + contents, err := os.ReadFile(outputPath) + require.NoError(t, err) + events = append(events, string(contents)) + }) + + testCase.runPreCleanup(t, nil, nil) + }) + + assert.Equal(t, []string{"cleanup"}, events) +} + +func TestRunPreCleanupWithoutSteps(t *testing.T) { + outputPath := filepath.Join(t.TempDir(), "pre-cleanup-env") + t.Setenv("KUTTL_PRE_CLEANUP_OUTPUT", outputPath) + + testCase := NewCase("no-step", "test_data/pre-cleanup") + testCase.SetLogger(testutils.NewTestLogger(t, "")) + require.NoError(t, testCase.LoadTestSteps()) + + testCase.runPreCleanup(t, nil, nil) + + contents, err := os.ReadFile(outputPath) + require.NoError(t, err) + assert.Equal(t, []string{"false", "no-step", "", "-1"}, strings.Split(strings.TrimSpace(string(contents)), "\n")) +} + +type preCleanupReporter struct { + stepName string + failure string +} + +func (r *preCleanupReporter) Step(stepName string) report.StepReporter { + r.stepName = stepName + return r +} + +func (r *preCleanupReporter) Failure(message string, _ ...error) { + r.failure = message +} + +func (r *preCleanupReporter) AddAssertions(int) {} + +func (r *preCleanupReporter) Done() {} + // testMock is an object useful for unit-testing Case.createNamespace(). type testMock struct { cleanup func() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/environment/00-test-case.yaml new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/environment/00-test-case.yaml --- old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/environment/00-test-case.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/environment/00-test-case.yaml 2026-11-16 08:16:51.000000000 +0100 @@ -0,0 +1,9 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- background: true + script: >- + printf '%s\n%s\n%s\n%s\n' + "$KUTTL_TEST_CASE_FAILED" "$KUTTL_TEST_CASE_NAME" + "$KUTTL_TEST_CASE_STEP_NAME" "$KUTTL_TEST_CASE_STEP_INDEX" + > "$KUTTL_PRE_CLEANUP_OUTPUT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/failure/00-test-case.yaml new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/failure/00-test-case.yaml --- old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/failure/00-test-case.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/failure/00-test-case.yaml 2026-11-16 08:16:51.000000000 +0100 @@ -0,0 +1,4 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- script: exit 42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/loading/00-test-case.yaml new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/loading/00-test-case.yaml --- old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/loading/00-test-case.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/loading/00-test-case.yaml 2026-11-16 08:16:51.000000000 +0100 @@ -0,0 +1,4 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- script: cleanup-resource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/no-step/00-test-case.yaml new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/no-step/00-test-case.yaml --- old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/no-step/00-test-case.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/no-step/00-test-case.yaml 2026-11-16 08:16:51.000000000 +0100 @@ -0,0 +1,9 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- background: true + script: >- + printf '%s\n%s\n%s\n%s\n' + "$KUTTL_TEST_CASE_FAILED" "$KUTTL_TEST_CASE_NAME" + "$KUTTL_TEST_CASE_STEP_NAME" "$KUTTL_TEST_CASE_STEP_INDEX" + > "$KUTTL_PRE_CLEANUP_OUTPUT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/ordering/00-test-case.yaml new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/ordering/00-test-case.yaml --- old/kuttl-0.28.0/internal/testcase/test_data/pre-cleanup/ordering/00-test-case.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kuttl-0.29.0/internal/testcase/test_data/pre-cleanup/ordering/00-test-case.yaml 2026-11-16 08:16:51.000000000 +0100 @@ -0,0 +1,4 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestCase +preCleanup: +- script: printf cleanup >> "$KUTTL_PRE_CLEANUP_OUTPUT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/utils/commands.go new/kuttl-0.29.0/internal/utils/commands.go --- old/kuttl-0.28.0/internal/utils/commands.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/utils/commands.go 2026-11-16 08:16:51.000000000 +0100 @@ -8,6 +8,7 @@ "errors" "fmt" "io" + "maps" "os" "os/exec" "path/filepath" @@ -72,7 +73,7 @@ // RunCommand runs a command with args. // args gets split on spaces (respecting quoted strings). // if the command is run in the background a reference to the process is returned for later cleanup. -func RunCommand(ctx context.Context, namespace string, cmd harness.Command, cwd string, stdout io.Writer, stderr io.Writer, logger Logger, timeout int, kubeconfigOverride string) (*exec.Cmd, error) { +func RunCommand(ctx context.Context, namespace string, cmd harness.Command, cwd string, stdout io.Writer, stderr io.Writer, logger Logger, timeout int, kubeconfigOverride string, extraEnv map[string]string) (*exec.Cmd, error) { actualDir, err := os.Getwd() if err != nil { return nil, fmt.Errorf("command %q with %w", cmd.String(), err) @@ -82,6 +83,7 @@ kuttlENV["NAMESPACE"] = namespace kuttlENV["KUBECONFIG"] = kubeconfigPath(actualDir, kubeconfigOverride) kuttlENV["PATH"] = fmt.Sprintf("%s/bin/:%s", actualDir, os.Getenv("PATH")) + maps.Copy(kuttlENV, extraEnv) // by default testsuite timeout is the command timeout // 0 is allowed for testsuite which means forever (or no timeout) @@ -182,13 +184,13 @@ // RunAssertCommands runs a set of commands specified as TestAssertCommand. func RunAssertCommands(ctx context.Context, logger Logger, namespace string, commands []harness.TestAssertCommand, workdir string, timeout int, kubeconfigOverride string) ([]*exec.Cmd, error) { - return RunCommands(ctx, logger, namespace, convertAssertCommand(commands, timeout), workdir, timeout, kubeconfigOverride) + return RunCommands(ctx, logger, namespace, convertAssertCommand(commands, timeout), workdir, timeout, kubeconfigOverride, nil) } // RunCommands runs a set of commands, returning any errors. // If any (non-background) command fails, the following commands are skipped // commands running in the background are returned. -func RunCommands(ctx context.Context, logger Logger, namespace string, commands []harness.Command, workdir string, timeout int, kubeconfigOverride string) ([]*exec.Cmd, error) { +func RunCommands(ctx context.Context, logger Logger, namespace string, commands []harness.Command, workdir string, timeout int, kubeconfigOverride string, extraEnv map[string]string) ([]*exec.Cmd, error) { bgs := []*exec.Cmd{} if commands == nil { @@ -196,7 +198,7 @@ } for i, cmd := range commands { - bg, err := RunCommand(ctx, namespace, cmd, workdir, logger, logger, logger, timeout, kubeconfigOverride) + bg, err := RunCommand(ctx, namespace, cmd, workdir, logger, logger, logger, timeout, kubeconfigOverride, extraEnv) if err != nil { cmdListSize := len(commands) if i+1 < cmdListSize { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/internal/utils/commands_test.go new/kuttl-0.29.0/internal/utils/commands_test.go --- old/kuttl-0.28.0/internal/utils/commands_test.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/internal/utils/commands_test.go 2026-11-16 08:16:51.000000000 +0100 @@ -235,7 +235,7 @@ logger := NewTestLogger(t, "") // script runs with output - _, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + _, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) if tt.wantedErr { assert.Error(t, err) @@ -260,7 +260,7 @@ logger := NewTestLogger(t, "") // assert foreground cmd returns nil - cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.NoError(t, err) assert.Nil(t, cmd) // foreground processes should have stdout @@ -270,7 +270,7 @@ stdout = &bytes.Buffer{} // assert background cmd returns process - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.NoError(t, err) assert.NotNil(t, cmd) @@ -284,7 +284,7 @@ hcmd.Command = "sleep 42" // assert foreground cmd times out - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 2, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 2, "", nil) assert.Error(t, err) assert.True(t, strings.Contains(err.Error(), "timeout")) assert.Nil(t, cmd) @@ -295,7 +295,7 @@ hcmd.Timeout = 2 // assert foreground cmd times out with command timeout - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.Error(t, err) assert.True(t, strings.Contains(err.Error(), "timeout")) assert.Nil(t, cmd) @@ -311,12 +311,12 @@ logger := NewTestLogger(t, "") // assert foreground cmd returns nil - cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.NoError(t, err) assert.Nil(t, cmd) hcmd.IgnoreFailure = false - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.Error(t, err) assert.Nil(t, cmd) @@ -325,7 +325,7 @@ Command: "bad-command", IgnoreFailure: true, } - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.Error(t, err) assert.Nil(t, cmd) } @@ -339,7 +339,7 @@ logger := NewTestLogger(t, "") // test there is a stdout - cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err := RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.NoError(t, err) assert.Nil(t, cmd) assert.True(t, stdout.Len() > 0) @@ -348,7 +348,7 @@ stdout = &bytes.Buffer{} stderr = &bytes.Buffer{} // test there is no stdout - cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "") + cmd, err = RunCommand(t.Context(), "", hcmd, "", stdout, stderr, logger, 0, "", nil) assert.NoError(t, err) assert.Nil(t, cmd) assert.True(t, stdout.Len() == 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/pkg/apis/testharness/v1beta1/test_types.go new/kuttl-0.29.0/pkg/apis/testharness/v1beta1/test_types.go --- old/kuttl-0.28.0/pkg/apis/testharness/v1beta1/test_types.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/pkg/apis/testharness/v1beta1/test_types.go 2026-11-16 08:16:51.000000000 +0100 @@ -88,6 +88,9 @@ // Which test runs should this case be used in. Empty selector matches all test runs. TestRunSelector *metav1.LabelSelector `json:"testRunSelector,omitempty"` + + // Commands to run after the test case finishes and before namespace cleanup. + PreCleanup []Command `json:"preCleanup,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kuttl-0.28.0/pkg/apis/testharness/v1beta1/zz_generated.deepcopy.go new/kuttl-0.29.0/pkg/apis/testharness/v1beta1/zz_generated.deepcopy.go --- old/kuttl-0.28.0/pkg/apis/testharness/v1beta1/zz_generated.deepcopy.go 2026-10-20 19:38:06.000000000 +0200 +++ new/kuttl-0.29.0/pkg/apis/testharness/v1beta1/zz_generated.deepcopy.go 2026-11-16 08:16:51.000000000 +0100 @@ -185,6 +185,11 @@ *out = new(v1.LabelSelector) (*in).DeepCopyInto(*out) } + if in.PreCleanup != nil { + in, out := &in.PreCleanup, &out.PreCleanup + *out = make([]Command, len(*in)) + copy(*out, *in) + } return } ++++++ kuttl.obsinfo ++++++ --- /var/tmp/diff_new_pack.bw0pFa/_old 2026-11-20 14:50:25.949790995 +0100 +++ /var/tmp/diff_new_pack.bw0pFa/_new 2026-11-20 14:50:25.955791249 +0100 @@ -1,5 +1,5 @@ name: kuttl -version: 0.28.0 -mtime: 1792517886 -commit: 2635740569a28f83f8fe1dc8e722017a6e02be69 +version: 0.29.0 +mtime: 1794813411 +commit: 0ec8b556b2f405933940f7ed463b1ada0cf12df7 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kuttl/vendor.tar.gz /work/SRC/openSUSE:Factory/.kuttl.new.1251/vendor.tar.gz differ: char 129, line 2
