No need to pass gslb to nsServerName* functions

k8gb-io · Oct 27, 2020 · d948445 · d948445
1 parent 1e56937
commit d948445
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/controllers/dnsupdate.go b/controllers/dnsupdate.go
@@ -79,7 +79,7 @@ func getExternalClusterHeartbeatFQDNs(gslb *k8gbv1beta1.Gslb) []string {
 
 func (r *GslbReconciler) getExternalTargets(gslb *k8gbv1beta1.Gslb, host string) ([]string, error) {
 
-	extGslbClusters := r.nsServerNameExt(gslb)
+	extGslbClusters := r.nsServerNameExt()
 
 	var targets []string
 
@@ -219,15 +219,15 @@ func (r *GslbReconciler) gslbDNSEndpoint(gslb *k8gbv1beta1.Gslb) (*externaldns.D
 	return dnsEndpoint, err
 }
 
-func (r *GslbReconciler) nsServerName(gslb *k8gbv1beta1.Gslb) string {
+func (r *GslbReconciler) nsServerName() string {
 	dnsZoneIntoNS := strings.ReplaceAll(r.Config.DNSZone, ".", "-")
 	return fmt.Sprintf("gslb-ns-%s-%s.%s",
 		dnsZoneIntoNS,
 		r.Config.ClusterGeoTag,
 		r.Config.EdgeDNSZone)
 }
 
-func (r *GslbReconciler) nsServerNameExt(gslb *k8gbv1beta1.Gslb) []string {
+func (r *GslbReconciler) nsServerNameExt() []string {
 
 	dnsZoneIntoNS := strings.ReplaceAll(r.Config.DNSZone, ".", "-")
 	var extNSServers []string
@@ -443,8 +443,8 @@ func (r *GslbReconciler) configureZoneDelegation(gslb *k8gbv1beta1.Gslb) (*recon
 		gslbZoneName := os.Getenv("DNS_ZONE")
 		log.Info("Creating/Updating DNSEndpoint CRDs for Route53...")
 		var NSServerList []string
-		NSServerList = append(NSServerList, r.nsServerName(gslb))
-		NSServerList = append(NSServerList, r.nsServerNameExt(gslb)...)
+		NSServerList = append(NSServerList, r.nsServerName())
+		NSServerList = append(NSServerList, r.nsServerNameExt()...)
 		sort.Strings(NSServerList)
 		NSServerIPs, err := r.coreDNSExposedIPs()
 		if err != nil {
@@ -465,7 +465,7 @@ func (r *GslbReconciler) configureZoneDelegation(gslb *k8gbv1beta1.Gslb) (*recon
 						Targets:    NSServerList,
 					},
 					{
-						DNSName:    r.nsServerName(gslb),
+						DNSName:    r.nsServerName(),
 						RecordTTL:  ttl,
 						RecordType: "A",
 						Targets:    NSServerIPs,
@@ -491,7 +491,7 @@ func (r *GslbReconciler) configureZoneDelegation(gslb *k8gbv1beta1.Gslb) (*recon
 		delegateTo := []ibclient.NameServer{}
 
 		for _, address := range addresses {
-			nameServer := ibclient.NameServer{Address: address, Name: r.nsServerName(gslb)}
+			nameServer := ibclient.NameServer{Address: address, Name: r.nsServerName()}
 			delegateTo = append(delegateTo, nameServer)
 		}
 
@@ -510,7 +510,7 @@ func (r *GslbReconciler) configureZoneDelegation(gslb *k8gbv1beta1.Gslb) (*recon
 			if len(findZone.Ref) > 0 {
 
 				// Drop own records for straight away update
-				existingDelegateTo := filterOutDelegateTo(findZone.DelegateTo, r.nsServerName(gslb))
+				existingDelegateTo := filterOutDelegateTo(findZone.DelegateTo, r.nsServerName())
 				existingDelegateTo = append(existingDelegateTo, delegateTo...)
 
 				// Drop external records if they are stale

diff --git a/controllers/gslb_controller_test.go b/controllers/gslb_controller_test.go
@@ -350,7 +350,7 @@ func TestGeneratesProperExternalNSTargetFQDNsAccordingToTheGeoTags(t *testing.T)
 	customConfig.ExtClustersGeoTags = []string{"za"}
 	settings := provideSettings(t, customConfig)
 	// act
-	got := settings.reconciler.nsServerNameExt(settings.gslb)
+	got := settings.reconciler.nsServerNameExt()
 	// assert
 	assert.Equal(t, want, got, "got:\n %q externalGslb NS records,\n\n want:\n %q", got, want)
 }
@@ -439,7 +439,7 @@ func TestCanFilterOutDelegatedZoneEntryAccordingFQDNProvided(t *testing.T) {
 	customConfig.ExtClustersGeoTags = []string{"za"}
 	settings := provideSettings(t, customConfig)
 	// act
-	extClusters := settings.reconciler.nsServerNameExt(settings.gslb)
+	extClusters := settings.reconciler.nsServerNameExt()
 	got := filterOutDelegateTo(delegateTo, extClusters[0])
 	// assert
 	assert.Equal(t, want, got, "got:\n %q filtered out delegation records,\n\n want:\n %q", got, want)