feat: custom cluster domain

Author: bsctl

charts/capi-kamaji-vsphere/README.md

@@ -20,6 +20,10 @@ A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| cluster.clusterNetwork.apiServerPort | int | `6443` | API Server port |
+| cluster.clusterNetwork.pods.cidrBlocks | list | `["10.93.0.0/16"]` | CIDR range for pods |
+| cluster.clusterNetwork.serviceDomain | string | `"cluster.local"` | Service Domain for cluster DNS |
+| cluster.clusterNetwork.services.cidrBlocks | list | `["10.96.0.0/16"]` | CIDR range for services |
 | cluster.controlPlane.addons.coreDNS | object | `{}` | KamajiControlPlane coreDNS configuration |
 | cluster.controlPlane.addons.konnectivity | object | `{}` | KamajiControlPlane konnectivity configuration |
 | cluster.controlPlane.addons.kubeProxy | object | `{}` | KamajiControlPlane kube-proxy configuration |

charts/capi-kamaji-vsphere/templates/cluster.yaml

@@ -6,6 +6,33 @@ metadata:
   name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}
   namespace: {{ .Release.Namespace }}
 spec:
+  {{- if .Values.cluster.clusterNetwork }}
+  clusterNetwork:
+    {{- if .Values.cluster.clusterNetwork.apiServerPort }}
+    apiServerPort: {{ .apiServerPort | default 6443 }}
+    {{- end }}
+    {{- if .Values.cluster.clusterNetwork.pods }}
+    {{- if .Values.cluster.clusterNetwork.pods.cidrBlocks }}
+    pods:
+      cidrBlocks:
+        {{- range .Values.cluster.clusterNetwork.pods.cidrBlocks }}
+        - {{ . | quote }}
+        {{- end }}
+    {{- end }}
+    {{- end }}
+    {{- if .Values.cluster.clusterNetwork.services }}
+    {{- if .Values.cluster.clusterNetwork.services.cidrBlocks }}
+    services:
+      cidrBlocks:
+        {{- range .Values.cluster.clusterNetwork.services.cidrBlocks }}
+        - {{ . | quote }}
+        {{- end }}
+    {{- end }}
+    {{- end }}
+    {{- if .Values.cluster.clusterNetwork.serviceDomain }}
+    serviceDomain: {{ .Values.cluster.clusterNetwork.serviceDomain | default "cluster.local" | quote }}
+    {{- end }}
+  {{- end }}
   controlPlaneRef:
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
     kind: KamajiControlPlane

charts/capi-kamaji-vsphere/values.yaml

@@ -32,6 +32,19 @@ ipamProvider:
 cluster:
   # -- Cluster name. If unset, the release name will be used
   name: ""
+  clusterNetwork:
+    # -- API Server port
+    apiServerPort: 6443
+    # -- Service Domain for cluster DNS
+    serviceDomain: cluster.local
+    pods:
+      # -- CIDR range for pods
+      cidrBlocks:
+      - "10.93.0.0/16"
+    services: 
+      # -- CIDR range for services
+      cidrBlocks:
+      - "10.96.0.0/16"
   controlPlane:
     # -- Labels to add to the control plane
     labels:
@@ -113,10 +126,6 @@ cluster:
 
 nodePools:
   - name: default
-    # # -- Additional cloud-init files to pass to the machines
-    # additionalCloudInitFiles: |
-    #   #cloud-config
-    #   timezone: Europe/Rome
     # -- VSphere datastore to use
     dataStore: "datastore"
     # -- VSphere folder to store VMs
@@ -183,6 +192,10 @@ nodePools:
       sshAuthorizedKeys: []
       # -- sudoers configuration
       sudo: ALL=(ALL) NOPASSWD:ALL
+    # # -- Additional cloud-init files to pass to the machines
+    # additionalCloudInitFiles: |
+    #   #cloud-config
+    #   timezone: Europe/Rome
     # -- 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