Merge branch 'main' into KU-1698/upgrade-status

charms/worker/charmcraft.yaml

@@ -60,6 +60,19 @@ bases:
 
 config:
   options:
+    bootstrap-node-taints:
+      type: string
+      default: ""
+      description: |
+        Space-separated list of taints to apply to this node at registration time.
+
+        This config is only used at bootstrap time when Kubelet first registers the
+        node with Kubernetes. To change node taints after deploy time, use kubectl
+        instead.
+
+        For more information, see the upstream Kubernetes documentation about
+        taints:
+        https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
     node-labels:
       default: ""
       type: string

charms/worker/k8s/src/charm.py

@@ -827,6 +827,9 @@ def _join_with_token(self, relation: ops.Relation, token: str, cluster_name: str
             request.config = NodeJoinConfig()
             config.extra_args.craft(self.config, request.config, cluster_name)
 
+            bootstrap_node_taints = str(self.config["bootstrap-node-taints"] or "").strip().split()
+            config.extra_args.taint_worker(request.config, bootstrap_node_taints)
+
         self.api_manager.join_cluster(request)
         log.info("Joined %s(%s)", self.unit, node_name)
 

charms/worker/k8s/src/config/extra_args.py

@@ -4,7 +4,7 @@
 # Learn more at: https://juju.is/docs/sdk
 
 """Parse extra arguments for Kubernetes components."""
-from typing import Dict, Union
+from typing import Dict, List, Union
 
 import ops
 from charms.k8s.v0.k8sd_api_manager import (
@@ -70,3 +70,18 @@ def craft(
 
     cmd = _parse(src["kubelet-extra-args"])
     dest.extra_node_kubelet_args = cmd
+
+
+def taint_worker(dest: NodeJoinConfig, taints: List[str]):
+    """Apply the specified list of taints to the node join configuration.
+
+    Updates the following attributes of the `config` object:
+        - extra_node_kubelet_args: arguments for kubelet.
+
+    Args:
+        dest (NodeJoinConfig):
+            The configuration object to be updated with extra arguments.
+        taints (List[str]):
+            The list of taints to apply.
+    """
+    dest.extra_node_kubelet_args["--register-with-taints"] = ",".join(taints)