Merge branch 'main' into v1.5693.0

Author: Laure-di

scaleway-async/scaleway_async/applesilicon/v1alpha1/marshalling.py

@@ -266,6 +266,10 @@ def unmarshal_Server(data: Any) -> Server:
     if field is not None:
         args["sudo_password"] = field
 
+    field = data.get("vnc_port", None)
+    if field is not None:
+        args["vnc_port"] = field
+
     field = data.get("status", None)
     if field is not None:
         args["status"] = field

scaleway-async/scaleway_async/applesilicon/v1alpha1/types.py

@@ -225,6 +225,11 @@ class Server:
     Admin password required to execute commands.
     """
 
+    vnc_port: int
+    """
+    VNC port to use for remote desktop connection.
+    """
+
     status: ServerStatus
     """
     Current status of the server.

scaleway-async/scaleway_async/container/v1beta1/api.py

@@ -630,6 +630,7 @@ async def create_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:
@@ -728,6 +729,7 @@ async def update_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:

scaleway-async/scaleway_async/container/v1beta1/marshalling.py

@@ -59,6 +59,12 @@ def unmarshal_ContainerScalingOption(data: Any) -> ContainerScalingOption:
     else:
         args["concurrent_requests_threshold"] = None
 
+    field = data.get("cpu_usage_threshold", None)
+    if field is not None:
+        args["cpu_usage_threshold"] = field
+    else:
+        args["cpu_usage_threshold"] = None
+
     return ContainerScalingOption(**args)
 
 
@@ -702,6 +708,7 @@ def marshal_ContainerScalingOption(
                     "concurrent_requests_threshold",
                     request.concurrent_requests_threshold,
                 ),
+                OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold),
             ]
         ),
     )

scaleway-async/scaleway_async/container/v1beta1/types.py

@@ -195,6 +195,8 @@ def __str__(self) -> str:
 class ContainerScalingOption:
     concurrent_requests_threshold: Optional[int]
 
+    cpu_usage_threshold: Optional[int]
+
 
 @dataclass
 class SecretHashedValue:
@@ -447,6 +449,7 @@ class Container:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
     created_at: Optional[datetime]
@@ -790,6 +793,7 @@ class CreateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 
@@ -1462,6 +1466,7 @@ class UpdateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 

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

@@ -24,6 +24,8 @@
 from .types import ClusterAutoscalerConfig
 from .types import ClusterOpenIDConnectConfig
 from .types import Pool
+from .types import ACLRuleRequest
+from .types import ACLRule
 from .types import CreateClusterRequestAutoUpgrade
 from .types import CreateClusterRequestAutoscalerConfig
 from .types import CreateClusterRequestOpenIDConnectConfig
@@ -39,10 +41,13 @@
 from .types import UpdateClusterRequestAutoscalerConfig
 from .types import UpdateClusterRequestOpenIDConnectConfig
 from .types import UpdatePoolRequestUpgradePolicy
+from .types import AddClusterACLRulesRequest
+from .types import AddClusterACLRulesResponse
 from .types import AuthExternalNodeRequest
 from .types import CreateClusterRequest
 from .types import CreateExternalNodeRequest
 from .types import CreatePoolRequest
+from .types import DeleteACLRuleRequest
 from .types import DeleteClusterRequest
 from .types import DeleteNodeRequest
 from .types import DeletePoolRequest
@@ -54,6 +59,8 @@
 from .types import GetNodeRequest
 from .types import GetPoolRequest
 from .types import GetVersionRequest
+from .types import ListClusterACLRulesRequest
+from .types import ListClusterACLRulesResponse
 from .types import ListClusterAvailableTypesRequest
 from .types import ListClusterAvailableTypesResponse
 from .types import ListClusterAvailableVersionsRequest
@@ -73,6 +80,8 @@
 from .types import RebootNodeRequest
 from .types import ReplaceNodeRequest
 from .types import ResetClusterAdminTokenRequest
+from .types import SetClusterACLRulesRequest
+from .types import SetClusterACLRulesResponse
 from .types import SetClusterTypeRequest
 from .types import UpdateClusterRequest
 from .types import UpdatePoolRequest
@@ -105,6 +114,8 @@
     "ClusterAutoscalerConfig",
     "ClusterOpenIDConnectConfig",
     "Pool",
+    "ACLRuleRequest",
+    "ACLRule",
     "CreateClusterRequestAutoUpgrade",
     "CreateClusterRequestAutoscalerConfig",
     "CreateClusterRequestOpenIDConnectConfig",
@@ -120,10 +131,13 @@
     "UpdateClusterRequestAutoscalerConfig",
     "UpdateClusterRequestOpenIDConnectConfig",
     "UpdatePoolRequestUpgradePolicy",
+    "AddClusterACLRulesRequest",
+    "AddClusterACLRulesResponse",
     "AuthExternalNodeRequest",
     "CreateClusterRequest",
     "CreateExternalNodeRequest",
     "CreatePoolRequest",
+    "DeleteACLRuleRequest",
     "DeleteClusterRequest",
     "DeleteNodeRequest",
     "DeletePoolRequest",
@@ -135,6 +149,8 @@
     "GetNodeRequest",
     "GetPoolRequest",
     "GetVersionRequest",
+    "ListClusterACLRulesRequest",
+    "ListClusterACLRulesResponse",
     "ListClusterAvailableTypesRequest",
     "ListClusterAvailableTypesResponse",
     "ListClusterAvailableVersionsRequest",
@@ -154,6 +170,8 @@
     "RebootNodeRequest",
     "ReplaceNodeRequest",
     "ResetClusterAdminTokenRequest",
+    "SetClusterACLRulesRequest",
+    "SetClusterACLRulesResponse",
     "SetClusterTypeRequest",
     "UpdateClusterRequest",
     "UpdatePoolRequest",