Working PR

Author: afgane

README.md

@@ -49,7 +49,7 @@ Galaxy will be available at `http://INSTANCE_IP/` once deployment completes
 
 - `-k, --ssh-key`: SSH public key for the ubuntu user (required)
 - `-d, --disk-name`: Name of persistent disk (default: galaxy-data-INSTANCE_NAME)
-- `-i, --machine-image`: Machine image name (default: galaxy-k8s-boot-v2025-09-26)
+- `-i, --machine-image`: Machine image name (default: galaxy-k8s-boot-v2025-11-04)
 - `-m, --machine-type`: Machine type (default: e2-standard-4)
 - `-p, --project`: GCP project ID (default: anvil-and-terra-development)
 - `-s, --disk-size`: Size of persistent disk (default: 150GB)
@@ -77,11 +77,11 @@ gcloud compute instances create ea-rke2-c \
   --project=anvil-and-terra-development \
   --zone=us-east4-c \
   --machine-type=e2-standard-4 \
-  --image=galaxy-k8s-boot-v2025-09-26 \
+  --image=galaxy-k8s-boot-v2025-11-04 \
   --image-project=anvil-and-terra-development \
   --boot-disk-size=100GB \
   --boot-disk-type=pd-balanced \
-  --create-disk=name=galaxy-data-disk,size=150GB,type=pd-balanced,device-name=galaxy-data,auto-delete=no \
+  --create-disk=name=galaxy-data-disk,size=150GB,type=pd-balanced,device-name=galaxy-data,auto-delete=yes \
   --tags=k8s,http-server,https-server \
   --scopes=cloud-platform \
   --metadata=ssh-keys="ubuntu:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC66Snr9/0wpnzOkseCDm5xwq8zOI3EyEh0eec0MkED32ZBCFBcS1bnuwh8ZJtjgK0lDEfMAyR9ZwBlGM+BZW1j9h62gw6OyddTNjcKpFEdC9iA6VLpaVMjiEv9HgRw3CglxefYnEefG6j7RW4J9SU1RxEHwhUUPrhNv4whQe16kKaG6P6PNKH8tj8UCoHm3WdcJRXfRQEHkjoNpSAoYCcH3/534GnZrT892oyW2cfiz/0vXOeNkxp5uGZ0iss9XClxlM+eUYA/Klv/HV8YxP7lw8xWSGbTWqL7YkWa8qoQQPiV92qmJPriIC4dj+TuDsoMjbblcgMZN1En+1NEVMbV ea_key_pair"

bin/launch_vm.sh

@@ -9,7 +9,7 @@ set -e
 PROJECT="anvil-and-terra-development"
 ZONE="us-east4-c"
 MACHINE_TYPE="e2-standard-4"
-MACHINE_IMAGE="galaxy-k8s-boot-v2025-09-26"
+MACHINE_IMAGE="galaxy-k8s-boot-v2025-11-04"
 BOOT_DISK_SIZE="100GB"
 DISK_SIZE="150GB"
 DISK_TYPE="pd-balanced"
@@ -45,7 +45,7 @@ Examples:
   $0 -k "ssh-rsa AAAAB3..." my-galaxy-vm
 
   # Launch VM with specific machine image
-  $0 -k "ssh-rsa AAAAB3..." -i galaxy-k8s-boot-v2025-09-26 my-galaxy-vm
+  $0 -k "ssh-rsa AAAAB3..." -i galaxy-k8s-boot-v2025-11-04 my-galaxy-vm
 
   # Launch VM with specific disk name
   $0 -k "ssh-rsa AAAAB3..." -d galaxy-shared-disk my-galaxy-vm

bin/user_data.sh

@@ -59,7 +59,7 @@ runcmd:
     echo "[`date`] - Inventory file created at /tmp/ansible-inventory/localhost; running ansible-pull..."
     echo "[`date`] - Galaxy persistence size: ${GXY_PERSISTENCE_SIZE}"
 
-    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 playbook.yml
+    ANSIBLE_CALLBACKS_ENABLED=profile_tasks ANSIBLE_HOST_PATTERN_MISMATCH=ignore ansible-pull -U https://github.com/galaxyproject/galaxy-k8s-boot.git -C refactoring -d /home/ubuntu/ansible -i /tmp/ansible-inventory/localhost --accept-host-key --limit 127.0.0.1 playbook.yml
 
     echo "[`date`] - User data script completed."
     '

image_prep.yml

@@ -44,6 +44,23 @@
       ansible.builtin.import_tasks: roles/image_preparation/tasks/base_packages.yml
       when: install_base_packages | bool
 
+    - name: Copy requirements.yml to remote host
+      ansible.builtin.copy:
+        src: requirements.yml
+        dest: /tmp/galaxy-k8s-boot-requirements.yml
+        mode: '0644'
+      when: install_rke2_prerequisites | bool
+
+    - name: Install Ansible collections from requirements.yml
+      ansible.builtin.command: ansible-galaxy collection install -r /tmp/galaxy-k8s-boot-requirements.yml
+      changed_when: true
+      when: install_rke2_prerequisites | bool
+
+    - name: Install Ansible roles from requirements.yml
+      ansible.builtin.command: ansible-galaxy role install -r /tmp/galaxy-k8s-boot-requirements.yml
+      changed_when: true
+      when: install_rke2_prerequisites | bool
+
   roles:
     - role: galaxyproject.cvmfs
       when: install_cvmfs | bool
@@ -136,6 +153,17 @@
         msg: "{{ item.cmd }} -> {{ item.stdout | default(item.stderr) }}"
       loop: "{{ version_checks.results }}"
 
+    - name: Verify Ansible roles are installed
+      ansible.builtin.command: ansible-galaxy role list
+      register: ansible_roles_list
+      changed_when: false
+      when: install_rke2_prerequisites | bool
+
+    - name: Display installed Ansible roles
+      ansible.builtin.debug:
+        var: ansible_roles_list.stdout_lines
+      when: install_rke2_prerequisites | bool
+
     - name: Create image preparation completion marker
       ansible.builtin.copy:
         content: |
@@ -146,6 +174,7 @@
           - Helm: {{ helm_version }} with pre-configured repositories (stable, cloudve)
           - CVMFS client with repositories: {{ cvmfs_verify_repos | join(', ') if install_cvmfs else 'NONE' }}
           - Container images: {{ 'Pre-fetched for faster deployment' if prefetch_container_images else 'Not cached' }}
+          - Ansible roles and collections: Installed from requirements.yml
 
           Next steps:
           1. Create image snapshot from this instance

requirements.yml

@@ -3,14 +3,12 @@
 
 collections:
   - name: community.general
-    version: ">=11.3.0"
+    version: ">=11.3.0,<12.0.0"
   - name: ansible.posix
-    version: ">=2.1.0"
+    version: ">=2.1.0,<3.0.0"
   - name: kubernetes.core
-    version: ">=6.1.0"
+    version: ">=6.1.0,<7.0.0"
 
 roles:
   - name: galaxyproject.cvmfs
-    version: ">=0.3.2"
-  - name: lablabs.rke2
-    version: ">=1.48.0"
+    version: "0.3.2"

roles/galaxy_k8s_deployment/defaults/main.yml

@@ -57,7 +57,7 @@ ingress_version: "4.13.2"  # https://github.com/kubernetes/ingress-nginx?tab=rea
 
 # Galaxy Application Configuration
 galaxy_chart: cloudve/galaxy
-galaxy_chart_version: "6.5.0"
+galaxy_chart_version: "6.5.1-dev"
 galaxy_deps_version: "1.1.1"
 galaxy_values_file: "values/values.yml"
 galaxy_persistence_size: "20Gi"

roles/image_preparation/README.md

@@ -78,7 +78,7 @@ gcloud compute instances create ea-mi \
   --project=anvil-and-terra-development \
   --zone=us-east4-b \
   --machine-type=n1-standard-2 \
-  --image=ubuntu-minimal-2404-noble-amd64-v20251002 \
+  --image=ubuntu-minimal-2404-noble-amd64-v20251020 \
   --image-project=ubuntu-os-cloud \
   --boot-disk-size=100GB \
   --tags=http-server,https-server \
@@ -89,11 +89,31 @@ gcloud compute instances create ea-mi \
 
 ### 2. Prepare Image
 
+#### Customization
+
+Override variables in `defaults/main.yml`, your inventory, or on the command
+line with parameters such as:
+
+```bash
+# Different RKE2 version
+-e "rke2_version=v1.34.1+rke2r1"
+
+# Different Helm version
+-e "helm_version=v3.19.0"
+```
+
+---
+
+Once a clean VM is running, create or update your inventory file with the
+instance details:
+
 ```bash
-# Create/update the inventory file with your instance details
 cp inventories/image_prep.ini.example inventories/image_prep.ini
+```
 
-# Run the prep playbook
+Then run the prep playbook to configure it:
+
+```bash
 ./bin/prepare_image.sh -i inventories/image_prep.ini
 ```
 
@@ -107,27 +127,15 @@ gcloud compute instances stop ea-mi --zone=us-east4-b
 Create the image, updating the name and source disk as needed:
 
 ```bash
-gcloud compute images create galaxy-k8s-boot-v2025-09-26 \
+gcloud compute images create galaxy-k8s-boot-v2025-11-04 \
   --source-disk=ea-mi \
   --source-disk-zone=us-east4-b \
   --family=galaxy-k8s-boot \
   --storage-location=us
 ```
 
-### 4. Deploy Galaxy Cluster
-
-Once the image is created, you can deploy a Galaxy cluster using the prepared
-image. Use the `playbook.yml` to set up the cluster, which has its own
-documentation in the main README.
-
-## Customization
-
-Override variables in inventory or command line:
-
-```bash
-# Different RKE2 version
--e "rke2_version=v1.34.1+rke2r1"
+### 4. Deploy Galaxy
 
-# Different Helm version
--e "helm_version=v3.19.0"
-```
+Once the image is created, you can deploy Galaxy using the prepared image. Use
+the `playbook.yml` to set up the cluster, which has its own documentation in the
+main README in this repo.

roles/image_preparation/files/container_images.yml

@@ -6,7 +6,7 @@ container_images:
 - docker.io/rancher/hardened-kubernetes:v1.34.1-rke2r1-build20250910
 - docker.io/rancher/rke2-runtime:v1.34.1-rke2r1
 - ghcr.io/cloudnative-pg/postgresql:17.2
-- quay.io/galaxyproject/galaxy-min:25.0.2
+- quay.io/galaxyproject/galaxy-min:25.1-auto
 - registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8
 - docker.io/bitnamilegacy/rabbitmq-cluster-operator:1.14.0-scratch-r5
 - docker.io/bitnamilegacy/rmq-messaging-topology-operator:1.7.1-scratch-r3

roles/image_preparation/tasks/base_packages.yml

@@ -1,18 +1,18 @@
 ---
-- name: Update package cache (Ubuntu)
+- name: Update package cache
   ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
   become: true
 
-- name: Install base system packages (Ubuntu)
+- name: Install base system packages
   ansible.builtin.apt:
     name: "{{ base_packages }}"
     state: present
     install_recommends: false
   become: true
 
-- name: Install Python packages via apt (Ubuntu 24.04+ compatible)
+- name: Install Python packages via apt
   ansible.builtin.apt:
     name:
       - python3-kubernetes

roles/image_preparation/tasks/container_prefetch.yml

@@ -24,7 +24,7 @@
   become: true
   when: rke2_binary.stat.exists
 
-- name: Pre-fetch container images using RKE2's containerd
+- name: Pre-fetch container images
   ansible.builtin.command: ctr --address /run/k3s/containerd/containerd.sock -n k8s.io images pull {{ item }}
   register: pull_result
   failed_when: false
@@ -74,7 +74,7 @@
   become: true
   when: rke2_binary.stat.exists
 
-- name: Clean up CNI and runtime state (with force removal)
+- name: Clean up CNI and runtime state
   ansible.builtin.shell: |
     rm -rf /var/lib/cni || true
     rm -rf /run/k3s || true