diff --git a/deploy.sh b/deploy.sh index 1eeebb805e426f0e6b719a4a46936a14da8bd72f..172889c07acdc2347b2dee2ddee8bf3061fdc53a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -91,7 +91,7 @@ for COMPONENT in $TFS_COMPONENTS; do fi if [ -n "$TFS_REGISTRY_IMAGE" ]; then - echo "Pushing Docker image to '$TFS_REGISTRY_IMAGE'..." + echo " Pushing Docker image to '$TFS_REGISTRY_IMAGE'..." TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log" docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG" @@ -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 diff --git a/expose_ingress_grpc.sh b/expose_ingress_grpc.sh index 37d72aa8d66e1d2ff2e4677f245db8eaf2438ac4..8a4c837406d06ae8971a4d6ab2c5a8ae30cfc87f 100755 --- a/expose_ingress_grpc.sh +++ b/expose_ingress_grpc.sh @@ -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}"