Commit fed25771 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/73-nats-port-not-populated-in-nats-secret-in-some-cases-while-re-deploying-tfs-and-nats' into 'develop'

Resolve "NATS port not populated in NATS secret in some cases while re-deploying TFS and NATS together"

Closes #73

See merge request !187
parents 6324ced5 7c684e5e

deploy/tfs.sh

+17 −0
Original line number Diff line number Diff line
@@ -137,6 +137,11 @@ printf "\n" 


echo "Create secret with CockroachDB data"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

while [ -z "$CRDB_SQL_PORT" ]; do

    printf "%c" "."

    sleep 1

    CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

done

kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
@@ -148,6 +153,11 @@ printf "\n" 


echo "Create secret with NATS data"

NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

while [ -z "$NATS_CLIENT_PORT" ]; do

    printf "%c" "."

    sleep 1

    NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

done

kubectl create secret generic nats-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=NATS_NAMESPACE=${NATS_NAMESPACE} \

    --from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT}
@@ -157,6 +167,13 @@ echo "Create secret with QuestDB data" 
QDB_HTTP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

QDB_ILP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="ilp")].port}')

QDB_SQL_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

while [ -z "$QDB_HTTP_PORT" ] || [ -z "$QDB_ILP_PORT" ] || [ -z "$QDB_SQL_PORT" ]; do

    printf "%c" "."

    sleep 1

    QDB_HTTP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    QDB_ILP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="ilp")].port}')

    QDB_SQL_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

done

METRICSDB_HOSTNAME="questdb-public.${QDB_NAMESPACE}.svc.cluster.local"

kubectl create secret generic qdb-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=QDB_NAMESPACE=${QDB_NAMESPACE} \