feat: add labels and taints for nodes

Author: bsctl

charts/capi-kamaji-vsphere/Chart.yaml

@@ -1,5 +1,5 @@
 name: capi-kamaji-vsphere
-version: 0.1.1
+version: 0.1.2
 appVersion: 1.31.0
 description: A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
   and Kamaji.

charts/capi-kamaji-vsphere/README.md

@@ -1,6 +1,6 @@
 # capi-kamaji-vsphere
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.31.0](https://img.shields.io/badge/AppVersion-1.31.0-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.31.0](https://img.shields.io/badge/AppVersion-1.31.0-informational?style=flat-square)
 
 A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API and Kamaji.
 
@@ -65,7 +65,7 @@ A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
 | nodePools[0].staticRoutes | list | `[]` | Static network routes if required |
 | nodePools[0].storagePolicyName | string | `""` | VSphere storage policy to use |
 | nodePools[0].template | string | `"ubuntu-2204-kube-v1.31.0"` | VSphere template to clone |
-| nodePools[0].users | list | `[{"name":"ubuntu","sshAuthorizedKeys":[],"sudo":"ALL=(ALL) NOPASSWD:ALL"}]` | Search domains suffixes if required searchDomains: [] # -- VM network domain if required domain: "" # -- IPv4 gateway if required gateway: "" # -- users to create on machines |
+| nodePools[0].users | list | `[{"name":"ubuntu","sshAuthorizedKeys":[],"sudo":"ALL=(ALL) NOPASSWD:ALL"}]` | users to create on machines |
 | vSphere.dataCenter | string | `"datacenter"` | Datacenter to use |
 | vSphere.insecure | bool | `false` | If vCenter uses a self-signed cert |
 | vSphere.password | string | `"changeme"` | vSphere password |

charts/capi-kamaji-vsphere/templates/_kubeadm-config-template.tpl

@@ -5,6 +5,12 @@ joinConfiguration:
     kubeletExtraArgs:
       node-ip: "{{`{{ ds.meta_data.local_ipv4 }}`}}"
       cloud-provider: external
+      {{- if and .nodePool (hasKey .nodePool "labels") }}
+      node-labels: {{ .nodePool.labels | quote }}
+      {{- end }}
+      {{- if and .nodePool (hasKey .nodePool "taints") }}
+      register-with-taints: {{ .nodePool.taints | quote }}
+      {{- end }}
     name: "{{`{{ local_hostname }}`}}"
 preKubeadmCommands:
 - hostnamectl set-hostname "{{`{{ ds.meta_data.hostname }}`}}"

charts/capi-kamaji-vsphere/values.yaml

@@ -151,11 +151,15 @@ nodePools:
     # domain: ""
     # # -- IPv4 gateway if required
     # gateway: ""
-    # # -- users to create on machines
+    # -- users to create on machines
     users:
     - name: ubuntu
       sshAuthorizedKeys: []
       sudo: ALL=(ALL) NOPASSWD:ALL
+    # -- Labels to add to the node pool when joining the cluster
+    # labels: "node.kubernetes.io/node=foo"
+    # -- Taints to add to the node pool when joining the cluster
+    # taints: "node.kubernetes.io/node:NoSchedule"
 
 vSphereCloudControllerManager:
   # -- Installs vsphere-cloud-controller-manager on the management cluster