From 4dd64eed55766a098a156fa0780e29610079ac76 Mon Sep 17 00:00:00 2001
From: spilchen <mspilchen@opentext.com>
Date: Tue, 31 Oct 2023 08:12:05 -0300
Subject: [PATCH] VCluster API Refresh (#566)

This picks up the latest vclusterops package. It has some refactoring
done to export less from the vclusterops package and NMA fixes to allow
online upgrades.
---
 go.mod                                     | 2 +-
 go.sum                                     | 4 ++--
 scripts/wait-for-verticadb-steady-state.sh | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index aa39ba9f5..d83d3c90b 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/onsi/gomega v1.24.2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.14.0
-	github.com/vertica/vcluster v0.0.0-20231027171858-205f6b3b0002
+	github.com/vertica/vcluster v0.0.0-20231030223038-ded60d72ba13
 	github.com/vertica/vertica-sql-go v1.1.1
 	go.uber.org/zap v1.25.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
diff --git a/go.sum b/go.sum
index 7ed28df43..93d14d9bc 100644
--- a/go.sum
+++ b/go.sum
@@ -310,8 +310,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/tonglil/buflogr v1.0.1 h1:WXFZLKxLfqcVSmckwiMCF8jJwjIgmStJmg63YKRF1p0=
-github.com/vertica/vcluster v0.0.0-20231027171858-205f6b3b0002 h1:Ue6f9EzRuAmA9c8FxhZ3fHdSYf8lgdL+SRNunSn7Uao=
-github.com/vertica/vcluster v0.0.0-20231027171858-205f6b3b0002/go.mod h1:7oNKoLThwbNX69xUwZZOdiI3WunMCth3mCF0EXOqtuc=
+github.com/vertica/vcluster v0.0.0-20231030223038-ded60d72ba13 h1:cks8jJkolYdJ8f0wGnlf+I7mYXKfTtUkMq0bHAZbG6U=
+github.com/vertica/vcluster v0.0.0-20231030223038-ded60d72ba13/go.mod h1:7oNKoLThwbNX69xUwZZOdiI3WunMCth3mCF0EXOqtuc=
 github.com/vertica/vertica-sql-go v1.1.1 h1:sZYijzBbvdAbJcl4cYlKjR+Eh/X1hGKzukWuhh8PjvI=
 github.com/vertica/vertica-sql-go v1.1.1/go.mod h1:fGr44VWdEvL+f+Qt5LkKLOT7GoxaWdoUCnPBU9h6t04=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/scripts/wait-for-verticadb-steady-state.sh b/scripts/wait-for-verticadb-steady-state.sh
index e34b96467..665cca9e9 100755
--- a/scripts/wait-for-verticadb-steady-state.sh
+++ b/scripts/wait-for-verticadb-steady-state.sh
@@ -70,13 +70,9 @@ fi
 LOG_CMD="kubectl ${NS_OPT}logs -l control-plane=controller-manager -c manager --tail=-1"
 WEBHOOK_FILTER="--invert-match -e 'controller-runtime.webhook.webhooks' -e 'verticadb-resource'"
 DEPRECATION_FILTER="--invert-match 'VerticaDB is deprecated'"
-# Messages from AdapterPool can show up periodically. Temporarily filtering
-# those out while we hunt down the source of them (see VER-89861).
-ADAPTER_POOL_FILTER="--invert-match 'AdapterPool'"
 timeout $TIMEOUT bash -c -- "while ! $LOG_CMD | \
     grep $WEBHOOK_FILTER | \
     grep $DEPRECATION_FILTER | \
-    grep $ADAPTER_POOL_FILTER | \
     grep $VDB_FILTER | \
     tail -1 | grep --quiet '\"result\": {\"Requeue\":false,\"RequeueAfter\":0}, \"err\": null'; do sleep 1; done" &
 pid=$!