From 7120aea14025c788b039fe02a6b4b452b981acf5 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 5 Nov 2024 13:11:54 +0000
Subject: [PATCH] CockroachDB:
- Corrected deploy script
---
deploy/crdb.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/deploy/crdb.sh b/deploy/crdb.sh
index f13ce43b7..1c5f53bc2 100755
--- a/deploy/crdb.sh
+++ b/deploy/crdb.sh
@@ -154,21 +154,24 @@ function crdb_drop_databases_single() {
echo "Drop TFS databases, if exist"
#if [[ -z "${GITLAB_CI}" ]]; then
- #kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
- CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')
- CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
+ # #kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
+ # CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')
+ # CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
#else
# CRDB_HOST="127.0.0.1"
# CRDB_PORT=${CRDB_EXT_PORT_SQL}
#fi
- CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
- echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"
+ #CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
+ #echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"
DATABASES=$(
kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
+ ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public \
--execute "SHOW DATABASES;" --format=tsv | awk '{print $1}' | grep "^tfs"
+ #kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
+ # ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
+ # --execute "SHOW DATABASES;" --format=tsv | awk '{print $1}' | grep "^tfs"
)
echo "Found TFS databases: ${DATABASES}" | tr '\n' ' '
echo
@@ -176,8 +179,11 @@ function crdb_drop_databases_single() {
for DB_NAME in $DATABASES; do
echo "Dropping TFS database: $DB_NAME"
kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
+ ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public \
--execute="DROP DATABASE IF EXISTS $DB_NAME CASCADE;"
+ #kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
+ # ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
+ # --execute="DROP DATABASE IF EXISTS $DB_NAME CASCADE;"
done
echo
}
--
GitLab