Disable AppendCustomQueries flag in deploy-dev

Our kuttl tests expect the default behavior of not appending custom queries

Author: sfc-gh-jmckulka

Makefile

@@ -119,17 +119,16 @@ undeploy: ## Undeploy the PostgreSQL Operator
 
 .PHONY: deploy-dev
 deploy-dev: ## Deploy the PostgreSQL Operator locally
-deploy-dev: PGO_FEATURE_GATES ?= "AllAlpha=true"
 deploy-dev: get-pgmonitor
 deploy-dev: build-postgres-operator
 deploy-dev: createnamespaces
 	kubectl apply --server-side -k ./config/dev
 	hack/create-kubeconfig.sh postgres-operator pgo
 	env \
-		QUERIES_CONFIG_DIR="${QUERIES_CONFIG_DIR}" \
-		CRUNCHY_DEBUG=true \
-		PGO_FEATURE_GATES="${PGO_FEATURE_GATES}" \
-		CHECK_FOR_UPGRADES='$(if $(CHECK_FOR_UPGRADES),$(CHECK_FOR_UPGRADES),false)' \
+		QUERIES_CONFIG_DIR='$(QUERIES_CONFIG_DIR)' \
+		CRUNCHY_DEBUG="$${CRUNCHY_DEBUG:-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' \
 		PGO_INSTALLER='deploy-dev' \

testing/kuttl/e2e/exporter-custom-queries/00-assert.yaml

@@ -31,7 +31,7 @@ commands:
       contains "${queries_files}" "queries.yml" &&
       !(contains "${queries_files}" "defaultQueries.yml")
     } || {
-      echo >&2 'The /conf directory should contain the queries.yml file. Instead it has:'
+      echo >&2 'The /conf directory should only contain the queries.yml file. Instead it has:'
       echo "${queries_files}"
       exit 1
     }