Remove config flag and refactor assistant

Instead of using a config flag to select ClusterIPs for the CoreDNS service, inspect the service type to determine which set of IPs to return. Signed-off-by: Brandon Ewing <[email protected]>
k8gb-io · Dec 18, 2024 · 7e5d320 · 7e5d320
1 parent bada552
commit 7e5d320
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 44 deletions.
diff --git a/controllers/depresolver/depresolver.go b/controllers/depresolver/depresolver.go
@@ -144,8 +144,6 @@ type Config struct {
 	Infoblox Infoblox
 	// CoreDNSExposed flag
 	CoreDNSExposed bool `env:"COREDNS_EXPOSED, default=false"`
-	// CoreDNSClusterIPs flag
-	CoreDNSClusterIPs bool `env:"COREDNS_CLUSTERIPS, default=false"`
 	// Log configuration
 	Log Log
 	// MetricsAddress in format address:port where address can be empty, IP address, or hostname, default: 0.0.0.0:8080

diff --git a/controllers/mocks/assistant_mock.go b/controllers/mocks/assistant_mock.go
diff --git a/controllers/providers/assistant/assistant.go b/controllers/providers/assistant/assistant.go
@@ -21,12 +21,13 @@ Generated by GoLic, for more details see: https://github.com/AbsaOSS/golic
 import (
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
 	externaldns "sigs.k8s.io/external-dns/endpoint"
 )
 
 type Assistant interface {
-	//CoreDNSClusterIPs retrieves a list of ClusterIPs assigned to CoreDNS
-	CoreDNSClusterIPs() ([]string, error)
+	// GetCoreDNSService returns the CoreDNS Service
+	GetCoreDNSService() (*corev1.Service, error)
 	// CoreDNSExposedIPs retrieves list of exposed IP by CoreDNS
 	CoreDNSExposedIPs() ([]string, error)
 	// GetExternalTargets retrieves slice of targets from external clusters

diff --git a/controllers/providers/assistant/gslb.go b/controllers/providers/assistant/gslb.go
@@ -58,6 +58,7 @@ func NewGslbAssistant(client client.Client, k8gbNamespace string, edgeDNSServers
 	}
 }
 
+// GetCoreDNSService returns the CoreDNS Service
 func (r *Gslb) GetCoreDNSService() (*corev1.Service, error) {
 	serviceList := &corev1.ServiceList{}
 	sel, err := labels.Parse(coreDNSServiceLabel)
@@ -90,29 +91,24 @@ func (r *Gslb) GetCoreDNSService() (*corev1.Service, error) {
 	return coreDNSService, nil
 }
 
-// CoreDNSClusterIPs retrieves list of ClusterIPs assigned to CoreDNS
-func (r *Gslb) CoreDNSClusterIPs() ([]string, error) {
-	coreDNSService, err := r.GetCoreDNSService()
-	if err != nil {
-		return nil, err
-	}
-	if len(coreDNSService.Spec.ClusterIPs) == 0 {
-		errMessage := "no ClusterIPs found"
-		log.Warn().
-			Str("serviceName", coreDNSService.Name).
-			Msg(errMessage)
-		err := coreerrors.New(errMessage)
-		return nil, err
-	}
-	return coreDNSService.Spec.ClusterIPs, nil
-}
-
 // CoreDNSExposedIPs retrieves list of IP's exposed by CoreDNS
 func (r *Gslb) CoreDNSExposedIPs() ([]string, error) {
 	coreDNSService, err := r.GetCoreDNSService()
 	if err != nil {
 		return nil, err
 	}
+	if coreDNSService.Spec.Type == "ClusterIP" {
+		if len(coreDNSService.Spec.ClusterIPs) == 0 {
+			errMessage := "no ClusterIPs found"
+			log.Warn().
+				Str("serviceName", coreDNSService.Name).
+				Msg(errMessage)
+			err := coreerrors.New(errMessage)
+			return nil, err
+		}
+		return coreDNSService.Spec.ClusterIPs, nil
+	}
+	// LoadBalancer / ExternalName / NodePort service
 	var lb corev1.LoadBalancerIngress
 	if len(coreDNSService.Status.LoadBalancer.Ingress) == 0 {
 		errMessage := "no LoadBalancer ExternalIPs are found"

diff --git a/controllers/providers/dns/external.go b/controllers/providers/dns/external.go
@@ -66,11 +66,7 @@ func (p *ExternalDNSProvider) CreateZoneDelegationForExternalDNS(gslb *k8gbv1bet
 	var NSServerIPs []string
 	var err error
 	if p.config.CoreDNSExposed {
-		if p.config.CoreDNSClusterIPs {
-			NSServerIPs, err = p.assistant.CoreDNSClusterIPs()
-		} else {
-			NSServerIPs, err = p.assistant.CoreDNSExposedIPs()
-		}
+		NSServerIPs, err = p.assistant.CoreDNSExposedIPs()
 	} else {
 		if len(gslb.Status.LoadBalancer.ExposedIPs) == 0 {
 			// do not update DNS Endpoint for External DNS if no IPs are exposed

diff --git a/controllers/providers/dns/infoblox.go b/controllers/providers/dns/infoblox.go
@@ -70,11 +70,7 @@ func (p *InfobloxProvider) CreateZoneDelegationForExternalDNS(gslb *k8gbv1beta1.
 
 	var addresses []string
 	if p.config.CoreDNSExposed {
-		if p.config.CoreDNSClusterIPs {
-			addresses, err = p.assistant.CoreDNSClusterIPs()
-		} else {
-			addresses, err = p.assistant.CoreDNSExposedIPs()
-		}
+		addresses, err = p.assistant.CoreDNSExposedIPs()
 	} else {
 		addresses = gslb.Status.LoadBalancer.ExposedIPs
 	}