Merge branch 'main' into v1.6742.0

Author: remyleone

scaleway-async/poetry.lock

@@ -28,7 +28,7 @@ scaleway-core = "*"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }
-ruff = ">=0.5.0,<0.11.13"
+ruff = ">=0.5.0,<0.12.2"
 mypy = "^1.5.1"
 
 [build-system]

scaleway-async/pyproject.toml

@@ -1042,6 +1042,14 @@ def unmarshal_NodeMetadata(data: Any) -> NodeMetadata:
             else None
         )
 
+    field = data.get("provider_id", None)
+    if field is not None:
+        args["provider_id"] = field
+
+    field = data.get("resolvconf_path", None)
+    if field is not None:
+        args["resolvconf_path"] = field
+
     field = data.get("has_gpu", None)
     if field is not None:
         args["has_gpu"] = field
@@ -1054,6 +1062,22 @@ def unmarshal_NodeMetadata(data: Any) -> NodeMetadata:
     if field is not None:
         args["repo_uri"] = field
 
+    field = data.get("installer_tags", None)
+    if field is not None:
+        args["installer_tags"] = field
+
+    field = data.get("updater_bin_url", None)
+    if field is not None:
+        args["updater_bin_url"] = field
+
+    field = data.get("updater_bin_version", None)
+    if field is not None:
+        args["updater_bin_version"] = field
+
+    field = data.get("updater_bin_path", None)
+    if field is not None:
+        args["updater_bin_path"] = field
+
     return NodeMetadata(**args)
 
 

scaleway-async/scaleway_async/k8s/v1/marshalling.py

@@ -1876,12 +1876,24 @@ class NodeMetadata:
 
     node_taints: List[NodeMetadataCoreV1Taint]
 
+    provider_id: str
+
+    resolvconf_path: str
+
     has_gpu: bool
 
     external_ip: str
 
     repo_uri: str
 
+    installer_tags: str
+
+    updater_bin_url: str
+
+    updater_bin_version: str
+
+    updater_bin_path: str
+
 
 @dataclass
 class RebootNodeRequest:

scaleway-async/scaleway_async/k8s/v1/types.py

@@ -12,6 +12,7 @@
 from .types import PublicCatalogProductPropertiesHardwareRAM
 from .types import PublicCatalogProductPropertiesHardwareStorage
 from .types import PublicCatalogProductPropertiesAppleSilicon
+from .types import PublicCatalogProductPropertiesBlockStorage
 from .types import PublicCatalogProductPropertiesDedibox
 from .types import PublicCatalogProductPropertiesElasticMetal
 from .types import PublicCatalogProductPropertiesHardware
@@ -39,6 +40,7 @@
     "PublicCatalogProductPropertiesHardwareRAM",
     "PublicCatalogProductPropertiesHardwareStorage",
     "PublicCatalogProductPropertiesAppleSilicon",
+    "PublicCatalogProductPropertiesBlockStorage",
     "PublicCatalogProductPropertiesDedibox",
     "PublicCatalogProductPropertiesElasticMetal",
     "PublicCatalogProductPropertiesHardware",

scaleway-async/scaleway_async/product_catalog/v2alpha1/__init__.py

@@ -16,6 +16,7 @@
     PublicCatalogProductPropertiesHardwareRAM,
     PublicCatalogProductPropertiesHardwareStorage,
     PublicCatalogProductPropertiesAppleSilicon,
+    PublicCatalogProductPropertiesBlockStorage,
     PublicCatalogProductPropertiesDedibox,
     PublicCatalogProductPropertiesElasticMetal,
     PublicCatalogProductPropertiesHardware,
@@ -242,6 +243,27 @@ def unmarshal_PublicCatalogProductPropertiesAppleSilicon(
     return PublicCatalogProductPropertiesAppleSilicon(**args)
 
 
+def unmarshal_PublicCatalogProductPropertiesBlockStorage(
+    data: Any,
+) -> PublicCatalogProductPropertiesBlockStorage:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'PublicCatalogProductPropertiesBlockStorage' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    field = data.get("min_volume_size", None)
+    if field is not None:
+        args["min_volume_size"] = field
+
+    field = data.get("max_volume_size", None)
+    if field is not None:
+        args["max_volume_size"] = field
+
+    return PublicCatalogProductPropertiesBlockStorage(**args)
+
+
 def unmarshal_PublicCatalogProductPropertiesDedibox(
     data: Any,
 ) -> PublicCatalogProductPropertiesDedibox:
@@ -465,6 +487,14 @@ def unmarshal_PublicCatalogProductProperties(
     else:
         args["instance"] = None
 
+    field = data.get("block_storage", None)
+    if field is not None:
+        args["block_storage"] = unmarshal_PublicCatalogProductPropertiesBlockStorage(
+            field
+        )
+    else:
+        args["block_storage"] = None
+
     return PublicCatalogProductProperties(**args)
 
 

scaleway-async/scaleway_async/product_catalog/v2alpha1/marshalling.py

@@ -227,6 +227,19 @@ class PublicCatalogProductPropertiesAppleSilicon:
     """
 
 
+@dataclass
+class PublicCatalogProductPropertiesBlockStorage:
+    min_volume_size: int
+    """
+    The minimum size of storage volume for this product in bytes.
+    """
+
+    max_volume_size: int
+    """
+    The maximum size of storage volume for this product in bytes.
+    """
+
+
 @dataclass
 class PublicCatalogProductPropertiesDedibox:
     range: str
@@ -330,6 +343,8 @@ class PublicCatalogProductProperties:
 
     instance: Optional[PublicCatalogProductPropertiesInstance]
 
+    block_storage: Optional[PublicCatalogProductPropertiesBlockStorage]
+
 
 @dataclass
 class PublicCatalogProductUnitOfMeasure: