From 7d6d32104e65ead58c7a8850f062c3118052b950 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 6 Mar 2024 09:01:44 +0100 Subject: [PATCH] Set max resources in jobs --- artifacts/k8s_galaxy.yml | 15 +++++++++++++++ templates/k8s_galaxy.yaml | 2 ++ 2 files changed, 17 insertions(+) diff --git a/artifacts/k8s_galaxy.yml b/artifacts/k8s_galaxy.yml index c859832..7743c82 100644 --- a/artifacts/k8s_galaxy.yml +++ b/artifacts/k8s_galaxy.yml @@ -6,6 +6,8 @@ NAMESPACE: galaxy admin_users: "{{ galaxy_admin_users | default('admin@galaxy.com') }}" brand: "{{ galaxy_brand | default('IM Deployed Galaxy K8s Cluster') }}" + max_mem: "{{ galaxy_max_mem | default(0) }}" + max_cores: "{{ galaxy_max_cores | default(0) }}" tasks: - name: Install Git package: name=git @@ -69,6 +71,11 @@ environment: KUBECONFIG: /etc/kubernetes/admin.conf + - name: Remove GB from max_mem + set_fact: + max_mem: "{{ max_mem[:-2] | float - 0.5 }}" + when: max_mem and "GB" in max_mem + - name: Create galaxy helm chart values file copy: dest: /opt/galaxy_values.yaml @@ -84,6 +91,14 @@ galaxy: admin_users: {{ admin_users }} brand: {{ brand }} + jobs: + rules: + tpv_rules_local.yml: + destinations: + k8s: + runner: k8s + {{ 'max_cores: ' ~ max_cores if max_cores else '' }} + {{ 'max_mem: ' ~ max_mem if max_mem else '' }} - name: Deploy Galaxy command: helm install --create-namespace -n {{ NAMESPACE }} galaxy . --timeout 15m -f /opt/galaxy_values.yaml diff --git a/templates/k8s_galaxy.yaml b/templates/k8s_galaxy.yaml index 85a6194..02f3f4e 100644 --- a/templates/k8s_galaxy.yaml +++ b/templates/k8s_galaxy.yaml @@ -70,6 +70,8 @@ topology_template: inputs: galaxy_admin_users: { get_input: galaxy_admin_users } galaxy_brand: { get_input: galaxy_brand } + galaxy_max_memory: { get_input: wn_mem } + galaxy_max_cores: { get_input: wn_cpus } outputs: galaxy_endpoint: