Pre-merge code cleanup

deploy/component.sh

@@ -58,13 +58,13 @@ for COMPONENT in $TFS_COMPONENTS; do
 
     echo "  Building Docker image..."
     BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"
-    
+
     if [ "$COMPONENT" == "automation" ] || [ "$COMPONENT" == "policy" ]; then
         docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"
-        elif [ "$COMPONENT" == "pathcomp" ]; then
+    elif [ "$COMPONENT" == "pathcomp" ]; then
         BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"
         docker build -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . >> "$BUILD_LOG"
-        
+
         BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log"
         docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"
         # next command is redundant, but helpful to keep cache updated between rebuilds
@@ -79,24 +79,24 @@ for COMPONENT in $TFS_COMPONENTS; do
         if [ "$COMPONENT" == "pathcomp" ]; then
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
             docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL-frontend" > "$TAG_LOG"
-            
+
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"
             docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL-backend" > "$TAG_LOG"
-            
+
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"
             docker push "$IMAGE_URL-frontend" > "$PUSH_LOG"
-            
+
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"
             docker push "$IMAGE_URL-backend" > "$PUSH_LOG"
         else
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log"
             docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG"
-            
+
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"
             docker push "$IMAGE_URL" > "$PUSH_LOG"
         fi
     fi
-    
+
     echo "  Adapting '$COMPONENT' manifest file..."
     MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"
     cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
@@ -106,10 +106,10 @@ for COMPONENT in $TFS_COMPONENTS; do
         if [ "$COMPONENT" == "pathcomp" ]; then
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL-frontend#g" "$MANIFEST"
-            
+
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_URL-backend#g" "$MANIFEST"
-            
+
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"
         else
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
@@ -121,10 +121,10 @@ for COMPONENT in $TFS_COMPONENTS; do
         if [ "$COMPONENT" == "pathcomp" ]; then
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_NAME-frontend#g" "$MANIFEST"
-            
+
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_NAME-backend#g" "$MANIFEST"
-            
+
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
         else
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
@@ -132,9 +132,9 @@ for COMPONENT in $TFS_COMPONENTS; do
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
         fi
     fi
-    
+
     # TODO: harmonize names of the monitoring component
-    
+
     echo "  Deploying '$COMPONENT' component to Kubernetes..."
     DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
     kubectl --namespace $TFS_K8S_NAMESPACE delete -f "$MANIFEST" > "$DEPLOY_LOG"
@@ -142,33 +142,33 @@ for COMPONENT in $TFS_COMPONENTS; do
     COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
     kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
     kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
-    
+
     echo "  Collecting env-vars for '$COMPONENT' component..."
-    
+
     SERVICE_DATA=$(kubectl get service ${COMPONENT}service --namespace $TFS_K8S_NAMESPACE -o json)
     if [ -z "${SERVICE_DATA}" ]; then continue; fi
-    
+
     # Env vars for service's host address
     SERVICE_HOST=$(echo ${SERVICE_DATA} | jq -r '.spec.clusterIP')
     if [ -z "${SERVICE_HOST}" ]; then continue; fi
     # TODO: remove previous value from file
     ENVVAR_HOST=$(echo "${COMPONENT}service_SERVICE_HOST" | tr '[:lower:]' '[:upper:]')
     echo "export ${ENVVAR_HOST}=${SERVICE_HOST}" >> $ENV_VARS_SCRIPT
-    
+
     # Env vars for service's 'grpc' port (if any)
     SERVICE_PORT_GRPC=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="grpc") | .port')
     if [ -n "${SERVICE_PORT_GRPC}" ]; then
         ENVVAR_PORT_GRPC=$(echo "${COMPONENT}service_SERVICE_PORT_GRPC" | tr '[:lower:]' '[:upper:]')
         echo "export ${ENVVAR_PORT_GRPC}=${SERVICE_PORT_GRPC}" >> $ENV_VARS_SCRIPT
     fi
-    
+
     # Env vars for service's 'http' port (if any)
     SERVICE_PORT_HTTP=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="http") | .port')
     if [ -n "${SERVICE_PORT_HTTP}" ]; then
         ENVVAR_PORT_HTTP=$(echo "${COMPONENT}service_SERVICE_PORT_HTTP" | tr '[:lower:]' '[:upper:]')
         echo "export ${ENVVAR_PORT_HTTP}=${SERVICE_PORT_HTTP}" >> $ENV_VARS_SCRIPT
     fi
-    
+
     printf "\n"
 done