Commit 97bf91d2 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 !189
parents fed25771 89d43657

deploy/nats.sh

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ function nats_deploy_single() { 
    helm3 repo add nats https://nats-io.github.io/k8s/helm/charts/

    echo



    echo "Upgrade NATS Helm Chart"

    helm3 repo update nats

    echo



    echo "Install NATS (single-node)"

    echo ">>> Checking if NATS is deployed..."

    if kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; then
@@ -81,6 +85,10 @@ function nats_deploy_single() { 
    echo "NATS Port Mapping"

    echo ">>> Expose NATS Client port (4222->${NATS_EXT_PORT_CLIENT})"

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

    if [ -z "$NATS_PORT_CLIENT" ]; then

        # NATS charts updated and port name changed from "client" to "nats"; fix to support new name and enable backward compatibility

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

    fi

    PATCH='{"data": {"'${NATS_EXT_PORT_CLIENT}'": "'${NATS_NAMESPACE}'/'${NATS_NAMESPACE}':'${NATS_PORT_CLIENT}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"

deploy/tfs.sh

+4 −17
Original line number Diff line number Diff line
@@ -137,11 +137,6 @@ 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} \
@@ -153,11 +148,10 @@ 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

if [ -z "$NATS_CLIENT_PORT" ]; then

    # NATS charts updated and port name changed from "client" to "nats"; fix to support new name and enable backward compatibility

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

fi

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}
@@ -167,13 +161,6 @@ 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} \