Set gcloud disk type default to ssd

scality · Oct 11, 2023 · 55f9931 · 55f9931
1 parent 3df69de
commit 55f9931
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/runner_manager/backend/gcloud.py b/runner_manager/backend/gcloud.py
@@ -83,6 +83,7 @@ def disks(self) -> List[AttachedDisk]:
                 initialize_params=AttachedDiskInitializeParams(
                     source_image=self.image.self_link,
                     disk_size_gb=self.instance_config.disk_size_gb,
+                    disk_type=f"zones/{self.config.zone}/diskTypes/{self.instance_config.disk_type}",
                 ),
             )
         ]

diff --git a/runner_manager/models/backend.py b/runner_manager/models/backend.py
@@ -1,7 +1,7 @@
 from enum import Enum
 from pathlib import Path
 from string import Template
-from typing import Dict, List, Optional, Sequence, TypedDict
+from typing import Dict, List, Literal, Optional, Sequence, TypedDict
 
 from mypy_boto3_ec2.literals import InstanceTypeType, VolumeTypeType
 from mypy_boto3_ec2.type_defs import (
@@ -107,6 +107,7 @@ class GCPInstanceConfig(InstanceConfig):
     enable_nested_virtualization: bool = True
     spot: bool = False
     disk_size_gb: int = 20
+    disk_type: Literal["pd-ssd", "pd-standard"] = "pd-ssd"
 
     class Config:
         arbitrary_types_allowed = True

diff --git a/tests/unit/backend/test_gcp.py b/tests/unit/backend/test_gcp.py
@@ -97,13 +97,16 @@ def test_gcp_disks(runner: Runner, gcp_group: RunnerGroup):
     # patch self.image.self_link to return a fake image
 
     disks = gcp_group.backend.disks
+    zone = gcp_group.backend.config.zone
+    disk_type = gcp_group.backend.instance_config.disk_type
     assert len(disks) == 1
     assert (
         disks[0].initialize_params.disk_size_gb
         == gcp_group.backend.instance_config.disk_size_gb
     )
     assert disks[0].boot is True
     assert disks[0].auto_delete is True
+    assert disks[0].initialize_params.disk_type == f"zones/{zone}/diskTypes/{disk_type}"
 
 
 def test_gcp_instance(runner: Runner, gcp_group: RunnerGroup):