From 89b0296c790c80c985bd4d908e41c07a46e8c4ac Mon Sep 17 00:00:00 2001 From: jmckulk Date: Wed, 22 Oct 2025 17:03:04 -0400 Subject: [PATCH 1/2] Update pgbackrest-initialization script to be more portable /bin/bash doesn't work on systems like nix /usr/bin/env bash does other scripts throughout the repo use the more portable option --- testing/kuttl/scripts/pgbackrest-initialization.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/kuttl/scripts/pgbackrest-initialization.sh b/testing/kuttl/scripts/pgbackrest-initialization.sh index ba6cd4a7e5..9d60a4cd9d 100755 --- a/testing/kuttl/scripts/pgbackrest-initialization.sh +++ b/testing/kuttl/scripts/pgbackrest-initialization.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash EXPECTED_STATUS=$1 EXPECTED_NUM_BACKUPS=$2 From a8b363cc48a4600a43a1266c3f329e375fdbaead Mon Sep 17 00:00:00 2001 From: jmckulk Date: Wed, 22 Oct 2025 17:04:42 -0400 Subject: [PATCH 2/2] Disable AppendCustomQueries flag in deploy-dev Our kuttl tests expect the default behavior of not appending custom queries --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e4e2cd4f60..06355b4cc1 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ deploy-dev: createnamespaces env \ QUERIES_CONFIG_DIR='$(QUERIES_CONFIG_DIR)' \ CRUNCHY_DEBUG="$${CRUNCHY_DEBUG:-true}" \ - PGO_FEATURE_GATES="$${PGO_FEATURE_GATES:-AllAlpha=true}" \ + PGO_FEATURE_GATES="$${PGO_FEATURE_GATES:-AllAlpha=true,AppendCustomQueries=false}" \ CHECK_FOR_UPGRADES="$${CHECK_FOR_UPGRADES:-false}" \ KUBECONFIG=hack/.kube/postgres-operator/pgo \ PGO_NAMESPACE='postgres-operator' \