From 0f039419c485311c4295cb1c152d2c6a3facaa67 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 8 Jul 2024 16:09:42 +0000
Subject: [PATCH] Deploy scripts:
- Updated tfs.sh to inject workloads only when LinkerD is installed.
---
deploy/tfs.sh | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 3fdbe77fb..04895f984 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -204,6 +204,14 @@ if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then
DOCKER_BUILD="docker buildx build"
fi
+LINKERD_STATUS="$(microk8s status -a linkerd)"
+if [[ $linkerd_status =~ "enabled" ]]; then
+ echo "LinkerD installed: workloads will be injected"
+else
+ echo "LinkerD not installed"
+fi
+printf "\n"
+
for COMPONENT in $TFS_COMPONENTS; do
echo "Processing '$COMPONENT' component..."
@@ -279,8 +287,11 @@ for COMPONENT in $TFS_COMPONENTS; do
echo " Adapting '$COMPONENT' manifest file..."
MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"
- # cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
- cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST"
+ if [[ $linkerd_status =~ "enabled" ]]; then
+ cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST"
+ else
+ cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
+ fi
if [ "$COMPONENT" == "pathcomp" ]; then
IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
--
GitLab