Merge branch 'dev' into feature/multiple-values-files

Author: ksuderman

README.md

@@ -54,8 +54,33 @@ Galaxy will be available at `http://INSTANCE_IP/` once deployment completes
 - `-p, --project`: GCP project ID (default: anvil-and-terra-development)
 - `-s, --disk-size`: Size of persistent disk (default: 150GB)
 - `-z, --zone`: GCP zone (default: us-east4-c)
+- `-g, --git-repo`: Git repository URL (default: https://github.com/galaxyproject/galaxy-k8s-boot.git)
+- `-b, --git-branch`: Git branch to deploy (default: master)
 - `--ephemeral-only`: Create VM without persistent disk
 
+#### Examples
+
+**Basic deployment:**
+```bash
+bin/launch_vm.sh -k "ssh-rsa AAAAB3..." my-galaxy-vm
+```
+
+**Custom git repository and branch (for testing/development):**
+```bash
+bin/launch_vm.sh -k "ssh-rsa AAAAB3..." \
+  -g "https://github.com/username/galaxy-k8s-boot.git" \
+  -b "feature-branch" \
+  my-test-vm
+```
+
+**With custom machine type and larger disk:**
+```bash
+bin/launch_vm.sh -k "ssh-rsa AAAAB3..." \
+  -m "e2-standard-8" \
+  -s "500GB" \
+  my-production-vm
+```
+
 ### Manual Deployment
 
 #### Prerequisites

bin/launch_vm.sh

@@ -15,6 +15,8 @@ DISK_SIZE="150GB"
 DISK_TYPE="pd-balanced"
 GALAXY_CHART_VERSION="6.6.0"
 GALAXY_DEPS_VERSION="1.1.1"
+GIT_REPO="https://github.com/galaxyproject/galaxy-k8s-boot.git"
+GIT_BRANCH="master"
 
 # Parse command line arguments
 INSTANCE_NAME=""
@@ -42,9 +44,11 @@ Options:
   -m, --machine-type TYPE           Machine type (default: $MACHINE_TYPE)
   --galaxy-chart-version VERSION    Galaxy Helm chart version (default: $GALAXY_CHART_VERSION)
   --galaxy-deps-version VERSION     Galaxy dependencies chart version (default: $GALAXY_DEPS_VERSION)
+  -g, --git-repo REPO         Git repository URL (default: $GIT_REPO)
+  -b, --git-branch BRANCH     Git branch to deploy (default: $GIT_BRANCH)
   -f, --values FILE                 Helm values file (can be specified multiple times, default: values/values.yml)
-  --ephemeral-only                  Create VM without persistent disk
-  -h, --help                        Show this help message
+  --ephemeral-only            Create VM without persistent disk
+  -h, --help                  Show this help message
 
 Examples:
   # Launch VM with new or existing disk
@@ -65,6 +69,8 @@ Examples:
   # Launch VM with multiple Helm values files (order matters - later files override earlier ones)
   $0 -k "ssh-rsa AAAAB3..." -f values/values.yml -f values/gcp-batch.yml my-galaxy-vm
   $0 -k "ssh-rsa AAAAB3..." --values values/values.yml --values values/dev.yml --values values/v25.0.2.yml my-galaxy-vm
+  # Launch VM with custom git repository and branch
+  $0 -k "ssh-rsa AAAAB3..." -g "https://github.com/username/galaxy-k8s-boot.git" -b "feature-branch" my-galaxy-vm
 
 EOF
 }
@@ -110,6 +116,12 @@ while [[ $# -gt 0 ]]; do
             ;;
         -f|--values)
             GALAXY_VALUES_FILES+=("$2")
+        -g|--git-repo)
+            GIT_REPO="$2"
+            shift 2
+            ;;
+        -b|--git-branch)
+            GIT_BRANCH="$2"
             shift 2
             ;;
         --ephemeral-only)
@@ -174,6 +186,8 @@ echo "Machine Image: $MACHINE_IMAGE"
 echo "Galaxy Chart Version: $GALAXY_CHART_VERSION"
 echo "Galaxy Deps Version: $GALAXY_DEPS_VERSION"
 echo "Galaxy Values Files: ${GALAXY_VALUES_FILES[@]}"
+echo "Git Repository: $GIT_REPO"
+echo "Git Branch: $GIT_BRANCH"
 
 if [ "$EPHEMERAL_ONLY" = false ]; then
     echo "Disk Name: $DISK_NAME"
@@ -329,6 +343,15 @@ GCLOUD_CMD=(
     --metadata=ssh-keys="ubuntu:$SSH_KEY"
 )
 
+# Build metadata string
+METADATA="ssh-keys=ubuntu:$SSH_KEY,git-repo=${GIT_REPO},git-branch=${GIT_BRANCH}"
+if [ "$EPHEMERAL_ONLY" = false ]; then
+    METADATA="${METADATA},persistent-volume-size=${PV_SIZE}Gi"
+fi
+
+# Add combined metadata
+GCLOUD_CMD+=(--metadata="$METADATA")
+
 # Add disk flag if not ephemeral only
 if [ "$EPHEMERAL_ONLY" = false ]; then
     GCLOUD_CMD+=($DISK_FLAG)

bin/user_data.sh

@@ -44,6 +44,8 @@ runcmd:
 
     # Convert semicolon-separated values files to JSON array for Ansible
     GALAXY_VALUES_FILES_JSON=$(echo "$GALAXY_VALUES_FILES_LIST" | sed -e 's/;/","/g' -e 's/^/["/' -e 's/$/"]/')
+    GIT_REPO=$(curl -s -f "http://metadata.google.internal/computeMetadata/v1/instance/attributes/git-repo" -H "Metadata-Flavor: Google" 2>/dev/null || echo "https://github.com/galaxyproject/galaxy-k8s-boot.git")
+    GIT_BRANCH=$(curl -s -f "http://metadata.google.internal/computeMetadata/v1/instance/attributes/git-branch" -H "Metadata-Flavor: Google" 2>/dev/null || echo "master")
 
     mkdir -p /tmp/ansible-inventory
     cat > /tmp/ansible-inventory/localhost << EOF
@@ -65,9 +67,11 @@ runcmd:
     echo "[`date`] - Galaxy Chart Version: ${GALAXY_CHART_VERSION}"
     echo "[`date`] - Galaxy Deps Version: ${GALAXY_DEPS_VERSION}"
     echo "[`date`] - Galaxy Values Files: ${GALAXY_VALUES_FILES_LIST}"
+    echo "[`date`] - Git Repository: ${GIT_REPO}"
+    echo "[`date`] - Git Branch: ${GIT_BRANCH}"
     echo "[`date`] - Inventory file created at /tmp/ansible-inventory/localhost; running ansible-pull..."
 
-    ANSIBLE_CALLBACKS_ENABLED=profile_tasks ANSIBLE_HOST_PATTERN_MISMATCH=ignore ansible-pull -U https://github.com/galaxyproject/galaxy-k8s-boot.git -C master -d /home/ubuntu/ansible -i /tmp/ansible-inventory/localhost --accept-host-key --limit 127.0.0.1 --extra-vars "galaxy_chart_version=${GALAXY_CHART_VERSION}" --extra-vars "galaxy_deps_version=${GALAXY_DEPS_VERSION}" --extra-vars "galaxy_values_files=${GALAXY_VALUES_FILES_JSON}" playbook.yml
+    ANSIBLE_CALLBACKS_ENABLED=profile_tasks ANSIBLE_HOST_PATTERN_MISMATCH=ignore ansible-pull -U ${GIT_REPO} -C ${GIT_BRANCH} -d /home/ubuntu/ansible -i /tmp/ansible-inventory/localhost --accept-host-key --limit 127.0.0.1 --extra-vars "galaxy_chart_version=${GALAXY_CHART_VERSION}" --extra-vars "galaxy_deps_version=${GALAXY_DEPS_VERSION}" --extra-vars "galaxy_values_files=${GALAXY_VALUES_FILES_JSON}" playbook.yml
 
     echo "[`date`] - User data script completed."
     '