feat: add dnsServiceIPs field to network settings (#206)

Signed-off-by: Mario Valderrama <[email protected]>

Author: avorima

api/v1alpha1/kamajicontrolplane_types.go

@@ -81,6 +81,10 @@ type NetworkComponent struct {
 	// Configure additional Subject Address Names for the kube-apiserver certificate,
 	// useful if the TenantControlPlane is going to be exposed behind a FQDN with NAT.
 	CertSANs []string `json:"certSANs,omitempty"` //nolint:tagliatelle
+	// DNSServiceIPs contains the DNS Service IPs.
+	// If the CoreDNS addon is specified, its DNSServiceIPs will be used instead.
+	// When set to an empty slice, Kamaji will automatically inflect it from the Service CIDR.
+	DNSServiceIPs []string `json:"dnsServiceIPs,omitempty"`
 }
 
 // AddonsSpec defines the enabled addons and their features.

api/v1alpha1/zz_generated.deepcopy.go

@@ -6370,6 +6370,14 @@ spec:
                     items:
                       type: string
                     type: array
+                  dnsServiceIPs:
+                    description: |-
+                      DNSServiceIPs contains the DNS Service IPs.
+                      If the CoreDNS addon is specified, its DNSServiceIPs will be used instead.
+                      When set to an empty slice, Kamaji will automatically inflect it from the Service CIDR.
+                    items:
+                      type: string
+                    type: array
                   ingress:
                     description: |-
                       When specified, the KamajiControlPlane will be reachable using an Ingress object
@@ -13082,6 +13090,14 @@ spec:
                             items:
                               type: string
                             type: array
+                          dnsServiceIPs:
+                            description: |-
+                              DNSServiceIPs contains the DNS Service IPs.
+                              If the CoreDNS addon is specified, its DNSServiceIPs will be used instead.
+                              When set to an empty slice, Kamaji will automatically inflect it from the Service CIDR.
+                            items:
+                              type: string
+                            type: array
                           ingress:
                             description: |-
                               When specified, the KamajiControlPlane will be reachable using an Ingress object

config/control-plane-components.yaml

@@ -6652,6 +6652,14 @@ spec:
                     items:
                       type: string
                     type: array
+                  dnsServiceIPs:
+                    description: |-
+                      DNSServiceIPs contains the DNS Service IPs.
+                      If the CoreDNS addon is specified, its DNSServiceIPs will be used instead.
+                      When set to an empty slice, Kamaji will automatically inflect it from the Service CIDR.
+                    items:
+                      type: string
+                    type: array
                   ingress:
                     description: |-
                       When specified, the KamajiControlPlane will be reachable using an Ingress object

config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml

@@ -6731,6 +6731,14 @@ spec:
                             items:
                               type: string
                             type: array
+                          dnsServiceIPs:
+                            description: |-
+                              DNSServiceIPs contains the DNS Service IPs.
+                              If the CoreDNS addon is specified, its DNSServiceIPs will be used instead.
+                              When set to an empty slice, Kamaji will automatically inflect it from the Service CIDR.
+                            items:
+                              type: string
+                            type: array
                           ingress:
                             description: |-
                               When specified, the KamajiControlPlane will be reachable using an Ingress object

config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanetemplates.yaml

@@ -87,6 +87,8 @@ func (r *KamajiControlPlaneReconciler) createOrUpdateTenantControlPlane(ctx cont
 			} else {
 				tcp.Spec.Kubernetes.Version = kcp.Spec.Version
 			}
+			// Set before CoreDNS addon to allow override.
+			tcp.Spec.NetworkProfile.DNSServiceIPs = kcp.Spec.Network.DNSServiceIPs
 			// Kamaji addons and CoreDNS overrides
 			tcp.Spec.Addons = kcp.Spec.Addons.AddonsSpec
 			if kcp.Spec.Addons.CoreDNS != nil {