From d893c0c0f4ce8bc71e79a4e90d858894c5b62968 Mon Sep 17 00:00:00 2001 From: Drew Sessler Date: Mon, 16 Feb 2026 11:54:36 -0800 Subject: [PATCH 1/2] OTel kuttl test fix: add bad psql command to force an error and ensure there will be a postgres log to capture. --- .../e2e/otel-logging-and-metrics/22-assert-instance.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/22-assert-instance.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/22-assert-instance.yaml index 226bcce3cd..60e5fe5694 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/22-assert-instance.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/22-assert-instance.yaml @@ -4,6 +4,8 @@ commands: # First, check that all containers in the instance pod are ready. # Then, grab the collector metrics output and check that a postgres # metric is present, as well as a patroni metric. +# Then use psql to run a bad command in the database to get an error +# and ensure that there is a postgres log to capture. # Then, check the collector logs for patroni, and postgres logs. # Finally, ensure the monitoring user exists and is configured. - script: | @@ -35,6 +37,8 @@ commands: exit 1 } + kubectl exec "${pod}" -n "${NAMESPACE}" -- psql -c "SHOW DOES_NOT_EXIST;" 2>/dev/null || true + logs=$(kubectl logs "${pod}" --namespace "${NAMESPACE}" -c collector | grep InstrumentationScope) { contains "${logs}" 'InstrumentationScope patroni'; } || { retry "patroni logs not found" From 001d753353912dba6d32806670d2ba9b4ecf9960 Mon Sep 17 00:00:00 2001 From: Drew Sessler Date: Thu, 12 Feb 2026 12:49:43 -0800 Subject: [PATCH 2/2] Pin go version to 1.25 for kuttl github action test (until kuttl supports go 1.26). --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 105780ac48..a5cc9433fa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -93,7 +93,7 @@ jobs: steps: - uses: actions/checkout@v6 - uses: actions/setup-go@v6 - with: { go-version: stable } + with: { go-version: '1.25.x' } # TODO: revert to stable when kuttl supports Go 1.26 (missing testDeps.ModulePath) - name: Start k3s uses: ./.github/actions/k3d