Commit 2d23b59d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

CockroachDB: 

- Corrected deploy script
parent 7120aea1

deploy/crdb.sh

+5 −19
Original line number Diff line number Diff line
@@ -153,25 +153,14 @@ function crdb_undeploy_single() { 
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}')

    #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_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${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 --host=cockroachdb-public \

            ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \

            --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
@@ -179,11 +168,8 @@ 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 --host=cockroachdb-public \

            ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \

            --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

}