Use correct PV units

Author: afgane

bin/launch_vm.sh

@@ -163,6 +163,9 @@ if [ "$EPHEMERAL_ONLY" = false ]; then
         # Extract numeric value from DISK_SIZE (remove 'GB' suffix)
         DISK_SIZE_GB="${DISK_SIZE%GB}"
     fi
+
+    # Calculate disk persistence size in Gi (K8s will not accept size in GB)
+    PV_SIZE=$((DISK_SIZE_GB * 0.93))
 else
     echo "ℹ Using ephemeral storage only (no persistent disk)."
 fi
@@ -188,7 +191,7 @@ GCLOUD_CMD=(
 # Build metadata string
 METADATA="ssh-keys=ubuntu:$SSH_KEY"
 if [ "$EPHEMERAL_ONLY" = false ]; then
-    METADATA="${METADATA},persistent-disk-size=${DISK_SIZE_GB}GB"
+    METADATA="${METADATA},persistent-volume-size=${PV_SIZE}Gi"
 fi
 
 # Add combined metadata

bin/user_data.sh

@@ -37,10 +37,7 @@ runcmd:
     HOST_IP=$(curl -s ifconfig.me)
 
     # Get persistence size from metadata if available
-    PERSISTENT_DISK_SIZE=$(curl -s -f "http://metadata.google.internal/computeMetadata/v1/instance/attributes/persistent-disk-size" -H "Metadata-Flavor: Google" 2>/dev/null || echo "20GB")
-    # Remove 'GB' suffix for Ansible variable and deduct 10GB for system use
-    GALAXY_PERSISTENCE_SIZE=$(( ${PERSISTENT_DISK_SIZE%GB} - 10 ))
-
+    PV_SIZE=$(curl -s -f "http://metadata.google.internal/computeMetadata/v1/instance/attributes/persistent-volume-size" -H "Metadata-Flavor: Google" 2>/dev/null || echo "20Gi")
 
     mkdir -p /tmp/ansible-inventory
     cat > /tmp/ansible-inventory/localhost << EOF
@@ -52,8 +49,8 @@ runcmd:
     rke2_token="defaultSecret12345"
     rke2_additional_sans=["${HOST_IP}"]
     rke2_debug=true
-    nfs_size="${PERSISTENT_DISK_SIZE}"
-    galaxy_persistence_size="${GALAXY_PERSISTENCE_SIZE}GB"
+    nfs_size="${PV_SIZE}"
+    galaxy_persistence_size="${PV_SIZE}"
     galaxy_db_password="gxy-db-password"
     galaxy_user="dev@galaxyproject.org"
     EOF