feat(k8s): add pools labels, taints and startup_taints (scaleway#1565)

Author: scaleway-bot

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

@@ -1040,41 +1040,44 @@ async def list_pools_all(
     async def create_pool(
         self,
         *,
-        region: Optional[ScwRegion] = None,
         cluster_id: str,
         node_type: str,
         autoscaling: bool,
         size: int,
+        region: Optional[ScwRegion] = None,
         name: Optional[str] = None,
         placement_group_id: Optional[str] = None,
         min_size: Optional[int] = None,
-        autohealing: bool,
-        public_ip_disabled: bool,
         max_size: Optional[int] = None,
         container_runtime: Optional[Runtime] = None,
+        autohealing: bool,
+        public_ip_disabled: bool,
         tags: Optional[list[str]] = None,
         kubelet_args: Optional[dict[str, str]] = None,
         upgrade_policy: Optional[CreatePoolRequestUpgradePolicy] = None,
         zone: Optional[ScwZone] = None,
         root_volume_type: Optional[PoolVolumeType] = None,
         root_volume_size: Optional[int] = None,
         security_group_id: Optional[str] = None,
+        labels: Optional[dict[str, str]] = None,
+        taints: Optional[list[CoreV1Taint]] = None,
+        startup_taints: Optional[list[CoreV1Taint]] = None,
     ) -> Pool:
         """
         Create a new Pool in a Cluster.
         Create a new pool in a specific Kubernetes cluster.
-        :param region: Region to target. If none is passed will use default region from the config.
         :param cluster_id: Cluster ID to which the pool will be attached.
         :param node_type: Node type is the type of Scaleway Instance wanted for the pool. Nodes with insufficient memory are not eligible (DEV1-S, PLAY2-PICO, STARDUST). 'external' is a special node type used to provision instances from other cloud providers in a Kosmos Cluster.
         :param autoscaling: Defines whether the autoscaling feature is enabled for the pool.
         :param size: Size (number of nodes) of the pool.
+        :param region: Region to target. If none is passed will use default region from the config.
         :param name: Pool name.
         :param placement_group_id: Placement group ID in which all the nodes of the pool will be created, placement groups are limited to 20 instances.
         :param min_size: Defines the minimum size of the pool. Note that this field is only used when autoscaling is enabled on the pool.
-        :param autohealing: Defines whether the autohealing feature is enabled for the pool.
-        :param public_ip_disabled: Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway.
         :param max_size: Defines the maximum size of the pool. Note that this field is only used when autoscaling is enabled on the pool.
         :param container_runtime: Customization of the container runtime is available for each pool.
+        :param autohealing: Defines whether the autohealing feature is enabled for the pool.
+        :param public_ip_disabled: Defines if the public IP should be removed from Nodes. To use this feature, your Cluster must have an attached Private Network set up with a Public Gateway.
         :param tags: Tags associated with the pool, see [managing tags](https://www.scaleway.com/en/docs/kubernetes/api-cli/managing-tags).
         :param kubelet_args: Kubelet arguments to be used by this pool. Note that this feature is experimental.
         :param upgrade_policy: Pool upgrade policy.
@@ -1085,6 +1088,9 @@ async def create_pool(
         * `b_ssd` is the legacy remote block storage which means your system is stored on a centralized and resilient cluster. Not available for new pools, use `sbs_5k` or `sbs_15k` instead.
         :param root_volume_size: System volume disk size.
         :param security_group_id: Security group ID in which all the nodes of the pool will be created. If unset, the pool will use default Kapsule security group in current zone.
+        :param labels: Kubernetes labels applied and reconciled on the nodes.
+        :param taints: Kubernetes taints applied and reconciled on the nodes.
+        :param startup_taints: Kubernetes taints applied at node creation but not reconciled afterwards.
         :return: :class:`Pool <Pool>`
 
         Usage:
@@ -1129,6 +1135,9 @@ async def create_pool(
                     root_volume_type=root_volume_type,
                     root_volume_size=root_volume_size,
                     security_group_id=security_group_id,
+                    labels=labels,
+                    taints=taints,
+                    startup_taints=startup_taints,
                 ),
                 self.client,
             ),

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

@@ -16,6 +16,7 @@
     ClusterStatus,
     ClusterTypeAvailability,
     ClusterTypeResiliency,
+    CoreV1TaintEffect,
     MaintenanceWindowDayOfTheWeek,
     NodeStatus,
     PoolStatus,
@@ -28,6 +29,7 @@
     ClusterOpenIDConnectConfig,
     Cluster,
     Node,
+    CoreV1Taint,
     PoolUpgradePolicy,
     Pool,
     ACLRule,
@@ -60,7 +62,6 @@
     SetClusterACLRulesRequest,
     SetClusterTypeRequest,
     SetPoolLabelsRequest,
-    CoreV1Taint,
     SetPoolStartupTaintsRequest,
     SetPoolTaintsRequest,
     UpdateClusterRequestAutoUpgrade,
@@ -469,6 +470,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
     else:
         args["apiserver_cert_sans"] = []
 
+    field = data.get("acl_available", None)
+    if field is not None:
+        args["acl_available"] = field
+    else:
+        args["acl_available"] = False
+
     field = data.get("iam_nodes_group_id", None)
     if field is not None:
         args["iam_nodes_group_id"] = field
@@ -507,12 +514,6 @@ def unmarshal_Cluster(data: Any) -> Cluster:
     else:
         args["commitment_ends_at"] = None
 
-    field = data.get("acl_available", None)
-    if field is not None:
-        args["acl_available"] = field
-    else:
-        args["acl_available"] = False
-
     return Cluster(**args)
 
 
@@ -560,6 +561,12 @@ def unmarshal_Node(data: Any) -> Node:
     else:
         args["name"] = None
 
+    field = data.get("conditions", None)
+    if field is not None:
+        args["conditions"] = field
+    else:
+        args["conditions"] = {}
+
     field = data.get("public_ip_v4", None)
     if field is not None:
         args["public_ip_v4"] = field
@@ -572,12 +579,6 @@ def unmarshal_Node(data: Any) -> Node:
     else:
         args["public_ip_v6"] = None
 
-    field = data.get("conditions", None)
-    if field is not None:
-        args["conditions"] = field
-    else:
-        args["conditions"] = {}
-
     field = data.get("status", None)
     if field is not None:
         args["status"] = field
@@ -605,6 +606,35 @@ def unmarshal_Node(data: Any) -> Node:
     return Node(**args)
 
 
+def unmarshal_CoreV1Taint(data: Any) -> CoreV1Taint:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'CoreV1Taint' failed as data isn't a dictionary."
+        )
+
+    args: dict[str, Any] = {}
+
+    field = data.get("key", None)
+    if field is not None:
+        args["key"] = field
+    else:
+        args["key"] = None
+
+    field = data.get("value", None)
+    if field is not None:
+        args["value"] = field
+    else:
+        args["value"] = None
+
+    field = data.get("effect", None)
+    if field is not None:
+        args["effect"] = field
+    else:
+        args["effect"] = CoreV1TaintEffect.NO_SCHEDULE
+
+    return CoreV1Taint(**args)
+
+
 def unmarshal_PoolUpgradePolicy(data: Any) -> PoolUpgradePolicy:
     if not isinstance(data, dict):
         raise TypeError(
@@ -738,6 +768,18 @@ def unmarshal_Pool(data: Any) -> Pool:
     else:
         args["zone"] = None
 
+    field = data.get("placement_group_id", None)
+    if field is not None:
+        args["placement_group_id"] = field
+    else:
+        args["placement_group_id"] = None
+
+    field = data.get("upgrade_policy", None)
+    if field is not None:
+        args["upgrade_policy"] = unmarshal_PoolUpgradePolicy(field)
+    else:
+        args["upgrade_policy"] = None
+
     field = data.get("root_volume_type", None)
     if field is not None:
         args["root_volume_type"] = field
@@ -756,23 +798,33 @@ def unmarshal_Pool(data: Any) -> Pool:
     else:
         args["security_group_id"] = None
 
-    field = data.get("region", None)
+    field = data.get("labels", None)
     if field is not None:
-        args["region"] = field
+        args["labels"] = field
     else:
-        args["region"] = None
+        args["labels"] = {}
 
-    field = data.get("placement_group_id", None)
+    field = data.get("taints", None)
     if field is not None:
-        args["placement_group_id"] = field
+        args["taints"] = (
+            [unmarshal_CoreV1Taint(v) for v in field] if field is not None else None
+        )
     else:
-        args["placement_group_id"] = None
+        args["taints"] = []
 
-    field = data.get("upgrade_policy", None)
+    field = data.get("startup_taints", None)
     if field is not None:
-        args["upgrade_policy"] = unmarshal_PoolUpgradePolicy(field)
+        args["startup_taints"] = (
+            [unmarshal_CoreV1Taint(v) for v in field] if field is not None else None
+        )
     else:
-        args["upgrade_policy"] = None
+        args["startup_taints"] = []
+
+    field = data.get("region", None)
+    if field is not None:
+        args["region"] = field
+    else:
+        args["region"] = None
 
     field = data.get("root_volume_size", None)
     if field is not None:
@@ -1481,6 +1533,24 @@ def marshal_MaintenanceWindow(
     return output
 
 
+def marshal_CoreV1Taint(
+    request: CoreV1Taint,
+    defaults: ProfileDefaults,
+) -> dict[str, Any]:
+    output: dict[str, Any] = {}
+
+    if request.key is not None:
+        output["key"] = request.key
+
+    if request.value is not None:
+        output["value"] = request.value
+
+    if request.effect is not None:
+        output["effect"] = request.effect
+
+    return output
+
+
 def marshal_CreateClusterRequestPoolConfigUpgradePolicy(
     request: CreateClusterRequestPoolConfigUpgradePolicy,
     defaults: ProfileDefaults,
@@ -1646,6 +1716,19 @@ def marshal_CreateClusterRequestPoolConfig(
     if request.public_ip_disabled is not None:
         output["public_ip_disabled"] = request.public_ip_disabled
 
+    if request.labels is not None:
+        output["labels"] = {key: value for key, value in request.labels.items()}
+
+    if request.taints is not None:
+        output["taints"] = [
+            marshal_CoreV1Taint(item, defaults) for item in request.taints
+        ]
+
+    if request.startup_taints is not None:
+        output["startup_taints"] = [
+            marshal_CoreV1Taint(item, defaults) for item in request.startup_taints
+        ]
+
     if request.security_group_id is not None:
         output["security_group_id"] = request.security_group_id
 
@@ -1819,6 +1902,19 @@ def marshal_CreatePoolRequest(
     if request.security_group_id is not None:
         output["security_group_id"] = request.security_group_id
 
+    if request.labels is not None:
+        output["labels"] = {key: value for key, value in request.labels.items()}
+
+    if request.taints is not None:
+        output["taints"] = [
+            marshal_CoreV1Taint(item, defaults) for item in request.taints
+        ]
+
+    if request.startup_taints is not None:
+        output["startup_taints"] = [
+            marshal_CoreV1Taint(item, defaults) for item in request.startup_taints
+        ]
+
     return output
 
 
@@ -1860,24 +1956,6 @@ def marshal_SetPoolLabelsRequest(
     return output
 
 
-def marshal_CoreV1Taint(
-    request: CoreV1Taint,
-    defaults: ProfileDefaults,
-) -> dict[str, Any]:
-    output: dict[str, Any] = {}
-
-    if request.key is not None:
-        output["key"] = request.key
-
-    if request.value is not None:
-        output["value"] = request.value
-
-    if request.effect is not None:
-        output["effect"] = request.effect
-
-    return output
-
-
 def marshal_SetPoolStartupTaintsRequest(
     request: SetPoolStartupTaintsRequest,
     defaults: ProfileDefaults,