Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use GiB #204

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Use GiB #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions artifacts/k8s_galaxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@
- when: deployed.rc == 1
block:

- name: Remove GB from max_mem
- name: Remove GiB from max_mem
set_fact:
max_mem: "{{ max_mem[:-2] | float - 1 }}"
when: max_mem and "GB" in max_mem
max_mem: "{{ max_mem[:-3] | float - 1 }}"
when: max_mem and "GiB" in max_mem

- name: Create galaxy helm chart values file
copy:
Expand Down
2 changes: 1 addition & 1 deletion custom_types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ node_types:
kube_wn_mem:
type: scalar-unit.size
description: Kubernetes WNs Memory
default: 4 GB
default: 4 GiB
required: false
artifacts:
clues_role:
Expand Down
8 changes: 4 additions & 4 deletions templates/hadoop_cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the front-end node
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_cpus:
type: integer
description: Number of CPUs for the WNs
Expand All @@ -44,10 +44,10 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]


node_templates:
Expand Down
16 changes: 8 additions & 8 deletions templates/horovod_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the front-end node
default: 8 GB
default: 8 GiB
required: yes
constraints:
- valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
fe_disk_size:
type: scalar-unit.size
description: Size of the FE root disk.
default: 40 GB
default: 40 GiB
constraints:
- valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]

wn_num:
type: integer
Expand All @@ -53,16 +53,16 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 8 GB
default: 8 GiB
required: yes
constraints:
- valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_disk_size:
type: scalar-unit.size
description: Size of the WN root disk.
default: 40 GB
default: 40 GiB
constraints:
- valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
wn_num_gpus:
type: integer
description: Number of GPUs to assing to this VM
Expand Down
16 changes: 8 additions & 8 deletions templates/htcondor_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the front-end node
default: 1 GB
default: 1 GiB
required: yes
constraints:
- valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_cpus:
type: integer
description: Number of CPUs for the Worker Nodes
Expand All @@ -52,17 +52,17 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the Worker Nodes
default: 1 GB
default: 1 GiB
required: yes
constraints:
- valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]

fe_disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the FE instance (Set 0 if disk is not needed)
default: 0 GB
default: 0 GiB
constraints:
- valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
fe_volume_id:
type: string
description: "Or URL of the disk to be attached to the FE instance (format: ost://api.cloud.ifca.es/<vol_id>"
Expand All @@ -75,9 +75,9 @@ topology_template:
wn_disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the WN instances (Set 0 if disk is not needed)
default: 0 GB
default: 0 GiB
constraints:
- valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
wn_mount_path:
type: string
description: "Path to mount the WN attached disk"
Expand Down
12 changes: 6 additions & 6 deletions templates/jmeter_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the front-end node
default: 1 GB
default: 1 GiB
required: yes
fe_disk_size:
type: scalar-unit.size
description: Size of the FE root disk.
default: 20 GB
default: 20 GiB
constraints:
- valid_values: [ 20 GB, 30 GB, 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 20 GiB, 30 GiB, 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]

wn_cpus:
type: integer
Expand All @@ -43,14 +43,14 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 1 GB
default: 1 GiB
required: yes
wn_disk_size:
type: scalar-unit.size
description: Size of the WN root disk.
default: 20 GB
default: 20 GiB
constraints:
- valid_values: [ 20 GB, 30 GB, 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 20 GiB, 30 GiB, 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]

jmeter_version:
type: string
Expand Down
2 changes: 1 addition & 1 deletion templates/k8s_app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ topology_template:
pvc_size:
type: scalar-unit.size
description: Size of the Persistent Volume Claim
default: 10 GB
default: 10 GiB
pvc_mount_path:
type: string
description: Path to mount the Persistent Volume Claim
Expand Down
4 changes: 2 additions & 2 deletions templates/k8s_galaxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 8 GB
default: 8 GiB
required: yes
constraints:
- valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]


node_templates:
Expand Down
8 changes: 4 additions & 4 deletions templates/k8s_new_wn_type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ topology_template:
wng_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wng_instance_type:
type: string
description: Flavor name for the GPU WNs
Expand All @@ -62,9 +62,9 @@ topology_template:
wng_disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the GPU WN instances for storing containers
default: 0 GB
default: 0 GiB
constraints:
- valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]

wng_kube_nvidia_support:
type: boolean
Expand Down
8 changes: 4 additions & 4 deletions templates/kubeflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 8 GB
default: 8 GiB
required: yes
constraints:
- valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the WN instances for storing containers
default: 40 GB
default: 40 GiB
constraints:
- valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]

node_templates:

Expand Down
16 changes: 8 additions & 8 deletions templates/kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the front-end node
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
fe_instance_type:
type: string
description: Flavor name of the front-end node
default: ""
fe_disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the FE instance (Set 0 if disk is not needed)
default: 10 GB
default: 10 GiB
constraints:
- valid_values: [ 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 0 GB ]
- valid_values: [ 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 0 GiB ]
fe_volume_id:
type: string
description: "Or URL of the disk to be attached to the instance (format: ost://api.cloud.ifca.es/<vol_id>"
Expand All @@ -99,10 +99,10 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_num_gpus:
type: integer
description: Number of GPUs to assing to this VM
Expand All @@ -126,9 +126,9 @@ topology_template:
wn_disk_size:
type: scalar-unit.size
description: Size of the root disk of the WNs (in case of 0 disk will no be resized)
default: 20 GB
default: 20 GiB
constraints:
- valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB, 0 GB ]
- valid_values: [ 20 GiB, 50 GiB, 100 GiB, 200 GiB, 0 GiB ]
wn_kube_nvidia_support:
type: boolean
description: Flag to add NVIDIA support in the WN
Expand Down
12 changes: 6 additions & 6 deletions templates/kubernetes_ha.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ topology_template:
fe_mem:
type: scalar-unit.size
description: Amount of Memory for the control-plane nodes
default: 8 GB
default: 8 GiB
required: yes
constraints:
- valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
fe_instance_type:
type: string
description: Flavor name of the front-end node
Expand All @@ -60,20 +60,20 @@ topology_template:
wn_mem:
type: scalar-unit.size
description: Amount of Memory for the WNs
default: 4 GB
default: 4 GiB
required: yes
constraints:
- valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
- valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
wn_instance_type:
type: string
description: Flavor name for the WNs
default: ""
disk_size:
type: scalar-unit.size
description: Size of the disk to be attached to the FE instance
default: 10 GB
default: 10 GiB
constraints:
- valid_values: [ 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
- valid_values: [ 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
volume_id:
type: string
description: "Or URL of the disk to be attached to the instance (format: ost://api.cloud.ifca.es/<vol_id>"
Expand Down
4 changes: 2 additions & 2 deletions templates/mesos_cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ topology_template:
slave_mem:
type: scalar-unit.size
description: Amount of Memory for the slave node
default: 2 GB
default: 2 GiB
required: yes

master_cpus:
Expand All @@ -73,7 +73,7 @@ topology_template:
master_mem:
type: scalar-unit.size
description: Amount of Memory for the master node
default: 4 GB
default: 4 GiB
required: yes


Expand Down
4 changes: 2 additions & 2 deletions templates/minio_compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ topology_template:
storage_size:
type: scalar-unit.size
description: Size of the extra HD added to the instance
default: 50 GB
default: 50 GiB
constraints:
- valid_values: [ 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 10 TB, 20 TB, 40 TB, 100 TB ]
- valid_values: [ 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 10 TiB, 20 TiB, 40 TiB, 100 TiB ]
mount_path:
type: string
description: Path to mount the extra disk
Expand Down
4 changes: 2 additions & 2 deletions templates/mlflow_authvm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ topology_template:
storage_size:
type: scalar-unit.size
description: Size of the extra HD added to the instance (Set 0 if disk is not needed)
default: 20 GB
default: 20 GiB
constraints:
- valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 10 TB, 20 TB, 40 TB, 100 TB ]
- valid_values: [ 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 10 TiB, 20 TiB, 40 TiB, 100 TiB ]

mount_path:
type: string
Expand Down
2 changes: 1 addition & 1 deletion templates/nifi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ topology_template:
NIFI_CLUSTER_NODE_PROTOCOL_PORT: '11443'
NIFI_CLUSTER_NODE_READ_TIMEOUT: '2 min'
NIFI_CLUSTER_PROTOCOL_CONNECTION_HANDSHAKE_TIMEOUT: '2 min'
NIFI_CLUSTER_PROTOCOL_HEARTBEAT_INTERVAL: '1 min'
NIFI_CLUSTER_PROTOCOL_HEARTiBEAT_INTERVAL: '1 min'
NIFI_ELECTION_MAX_CANDIDATES: '2'
NIFI_ELECTION_MAX_WAIT: '1 min'
NIFI_SENSITIVE_PROPS_KEY: '1yhqju3ubhp5rjeb'
Expand Down
Loading
Loading