Commit 66ed7477 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Deploy scripts: 

- corrected service name computation in expose_ingress_grpc.sh script
- corrected log format in deploy.sh script
- added control to configure Grafana only when both webui and monitoring are deployed
parent 25b24c21

deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    printf "\n"

done



if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then

if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then

    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 3

expose_ingress_grpc.sh

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ for COMPONENT in $TFS_COMPONENTS; do 
        continue;

    fi



    PATCH='{"data": {"'${SERVICE_GRPC_PORT}'": "'$TFS_K8S_NAMESPACE'/'${COMPONENT}service':'${SERVICE_GRPC_PORT}'"}}'

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    PATCH='{"data": {"'${SERVICE_GRPC_PORT}'": "'$TFS_K8S_NAMESPACE'/'${COMPONENT_OBJNAME}service':'${SERVICE_GRPC_PORT}'"}}'

    #echo "PATCH: ${PATCH}"

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