julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #293 from truecharts/cleanup

Browse Source 
try to deal with globbing better...
This commit is contained in:
Kjeld Schouten-Lebbing 2022-12-29 12:36:43 +01:00 committed by GitHub
commit 863006d4d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
functions/mount.sh
View File

@ -36,34 +36,34 @@ do
#Check for valid selection. If no issues, continue #Check for valid selection. If no issues, continue
[[ $selection == 0 ]] && echo "Exiting.." && exit [[ $selection == 0 ]] && echo "Exiting.." && exit
app=$(echo -e "$list" | grep ^"$selection)" | awk '{print $2}' | cut -c 4- ) app=$(echo -e "$list" | grep ^"$selection)" | awk '{print $2}' | cut -c 4- )
[[ -z "$app" ]] && echo "Invalid Selection: $selection, was not an option" && sleep 3 && continue [[ -z "${app}" ]] && echo "Invalid Selection: $selection, was not an option" && sleep 3 && continue
pvc=$(echo -e "$list" | grep ^"$selection)") pvc=$(echo -e "$list" | grep ^"$selection)")
#Stop applicaiton if not stopped #Stop applicaiton if not stopped
status=$(cli -m csv -c 'app chart_release query name,status' | grep "^$app," | awk -F ',' '{print $2}'| tr -d " \t\n\r") status=$(cli -m csv -c 'app chart_release query name,status' | grep "^${app}," | awk -F ',' '{print $2}'| tr -d " \t\n\r")
if [[ "$status" != "STOPPED" ]]; then if [[ "$status" != "STOPPED" ]]; then
echo -e "\nStopping $app prior to mount" echo -e "\nStopping ${app} prior to mount"
if ! cli -c 'app chart_release scale release_name='\""$app"\"\ 'scale_options={"replica_count": 0}' &> /dev/null; then if ! cli -c 'app chart_release scale release_name='\""${app}"\"\ 'scale_options={"replica_count": 0}' &> /dev/null; then
echo "Failed to stop $app" echo "Failed to stop ${app}"
exit 1 exit 1
else else
echo "Stopped" echo "Stopped"
fi fi
else else
echo -e "\n$app is already stopped" echo -e "\n${app} is already stopped"
fi fi
#Grab data then output and mount #Grab data then output and mount
data_name=$(echo "$pvc" | awk '{print $3}') data_name=$(echo "${pvc}" | awk '{print $3}')
volume_name=$(echo "$pvc" | awk '{print $4}') volume_name=$(echo "${pvc}" | awk '{print $4}')
full_path=$(zfs list -t filesystem -r "$pool"/ix-applications/releases/"$app"/volumes -o name -H | grep "$volume_name") full_path=$(zfs list -t filesystem -r "${pool}"/ix-applications/releases/"${app}"/volumes -o name -H | grep "$volume_name")
if ! zfs set mountpoint=/truetool/"$data_name" "$full_path" ; then if ! zfs set mountpoint=/truetool/"$data_name" "${full_path}" ; then
echo "Error: Failed to mount $app" echo "Error: Failed to mount ${app}"
exit 1 exit 1
else else
echo -e "\nMounted\n$data_name" echo -e "\nMounted\n$data_name"
fi fi
echo -e "\nUnmount with:\nzfs set mountpoint=legacy $full_path && rmdir /mnt/truetool/$data_name\n\nOr use the Unmount All option\n" echo -e "\nUnmount with:\nzfs set mountpoint=legacy ${full_path} && rmdir /mnt/truetool/$data_name\n\nOr use the Unmount All option\n"
#Ask if user would like to mount something else #Ask if user would like to mount something else
while true while true
@ -96,8 +96,8 @@ do
main=$(k3s kubectl get pvc -A | grep -E "\s$i\s" | awk '{print $1, $2, $4}') main=$(k3s kubectl get pvc -A | grep -E "\s$i\s" | awk '{print $1, $2, $4}')
app=$(echo "$main" | awk '{print $1}' | cut -c 4-) app=$(echo "$main" | awk '{print $1}' | cut -c 4-)
pvc=$(echo "$main" | awk '{print $3}') pvc=$(echo "$main" | awk '{print $3}')
full_path=$(find /mnt/"$pool"/ix-applications/releases/"$app"/volumes/ -maxdepth 0 | cut -c 6-) full_path=$(find /mnt/"${pool}"/ix-applications/releases/"${app}"/volumes/ -maxdepth 0 | cut -c 6-)
zfs set mountpoint=legacy "$full_path""$pvc" zfs set mountpoint=legacy "${full_path}""${pvc}"
echo "$i unmounted" && rmdir /mnt/truetool/"$i" || echo "failed to unmount $i" echo "$i unmounted" && rmdir /mnt/truetool/"$i" || echo "failed to unmount $i"
done done
rmdir /mnt/truetool rmdir /mnt/truetool