Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Name servers should belong to zone they serve #857

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Name servers should belong to zone they serve #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions controllers/depresolver/depresolver_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ func (c *Config) GetClusterHeartbeatFQDN(gslbName string) string {
// DNS_ZONE k8gb-test.gslb.cloud.example.com
// EDGE_DNS_ZONE: cloud.example.com
// CLUSTER_GEOTAG: us
// will generate "gslb-ns-us-k8gb-test-gslb.cloud.example.com"
// will generate "gslb-ns-us-k8gb-test-gslb.k8gb-test.gslb.cloud.example.com"
// If edgeDNSServer == localhost or 127.0.0.1 than edgeDNSServer is returned.
// The function is private and expects only valid inputs.
func getNsName(tag, dnsZone, edgeDNSZone, edgeDNSServer string) string {
Expand All @@ -400,8 +400,7 @@ func getNsName(tag, dnsZone, edgeDNSZone, edgeDNSServer string) string {
}
const prefix = "gslb-ns"
d := strings.TrimSuffix(dnsZone, "."+edgeDNSZone)
domainX := strings.ReplaceAll(d, ".", "-")
return fmt.Sprintf("%s-%s-%s.%s", prefix, tag, domainX, edgeDNSZone)
return fmt.Sprintf("%s-%s.%s.%s", prefix, tag, d, edgeDNSZone)
}

// getHeartbeatFQDN returns heartbeat for geo tag.
Expand Down
41 changes: 22 additions & 19 deletions controllers/depresolver/depresolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,9 +1166,9 @@ func TestNsServerNamesWithMultipleExtClusterGeoTag(t *testing.T) {
// assert
assert.NoError(t, err)
assert.Len(t, config.GetExternalClusterNSNames(), 2)
assert.Equal(t, "gslb-ns-us-west-1-k8gb-test-preprod-gslb.cloud.example.com", config.GetClusterNSName())
for k, v := range map[string]string{defaultClusterGeoTagUs2: "gslb-ns-us-east-1-k8gb-test-preprod-gslb.cloud.example.com",
defaultClusterGeoTagEu: "gslb-ns-eu-central-1-k8gb-test-preprod-gslb.cloud.example.com"} {
assert.Equal(t, "gslb-ns-us-west-1.k8gb-test-preprod.gslb.cloud.example.com", config.GetClusterNSName())
for k, v := range map[string]string{defaultClusterGeoTagUs2: "gslb-ns-us-east-1.k8gb-test-preprod.gslb.cloud.example.com",
defaultClusterGeoTagEu: "gslb-ns-eu-central-1.k8gb-test-preprod.gslb.cloud.example.com"} {
assert.Equal(t, config.GetExternalClusterNSNames()[k], v)
}
}
Expand Down Expand Up @@ -1212,8 +1212,8 @@ func TestNsServerNamesWithOneExtClusterGeoTag(t *testing.T) {
// assert
assert.NoError(t, err)
assert.Len(t, config.GetExternalClusterNSNames(), 1)
assert.Equal(t, "gslb-ns-us-west-1-k8gb-test-preprod-gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, config.GetExternalClusterNSNames()["location-2"], "gslb-ns-location-2-k8gb-test-preprod-gslb.cloud.example.com")
assert.Equal(t, "gslb-ns-us-west-1.k8gb-test-preprod.gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, config.GetExternalClusterNSNames()["location-2"], "gslb-ns-location-2.k8gb-test-preprod.gslb.cloud.example.com")
}

func TestNsServerNamesWithExtClusterGeoTagsContainingClusterGeoTag(t *testing.T) {
Expand All @@ -1233,15 +1233,15 @@ func TestNsServerNamesWithExtClusterGeoTagsContainingClusterGeoTag(t *testing.T)
// assert
assert.NoError(t, err)
assert.Len(t, config.GetExternalClusterNSNames(), 1)
assert.Equal(t, "gslb-ns-us-west-1-k8gb-test-preprod-gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, config.GetExternalClusterNSNames()["location-2"], "gslb-ns-location-2-k8gb-test-preprod-gslb.cloud.example.com")
assert.Equal(t, "gslb-ns-us-west-1.k8gb-test-preprod.gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, config.GetExternalClusterNSNames()["location-2"], "gslb-ns-location-2.k8gb-test-preprod.gslb.cloud.example.com")
}

func TestNsServerNamesLargeDNSZone(t *testing.T) {
defer cleanup()
// arrange DNSZone exceeds
customConfig := predefinedConfig
customConfig.DNSZone = "k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah.gslb.cloud.example.com"
customConfig.DNSZone = "k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah.gslb.cloud.example.com"
customConfig.EdgeDNSZone = defaultEdgeDNSZone
customConfig.ClusterGeoTag = "us"
configureEnvVar(customConfig)
Expand All @@ -1252,15 +1252,15 @@ func TestNsServerNamesLargeDNSZone(t *testing.T) {

// assert
assert.Error(t, err)
assert.Equal(t, "gslb-ns-us-k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, "gslb-ns-us.k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah.gslb.cloud.example.com", config.GetClusterNSName())
extNsNames := config.GetExternalClusterNSNames()
expectedExtNsNames := map[string]string{"za": "gslb-ns-za-k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-gslb.cloud.example.com",
"eu": "gslb-ns-eu-k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-gslb.cloud.example.com"}
expectedExtNsNames := map[string]string{"za": "gslb-ns-za.k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah.gslb.cloud.example.com",
"eu": "gslb-ns-eu.k8gb-test-preprod-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah.gslb.cloud.example.com"}
assert.True(t, reflect.DeepEqual(extNsNames, expectedExtNsNames), "maps must be equal: \n %v\n %v", extNsNames, expectedExtNsNames)
}

func TestNsServerNamesWithLargeExtClusterGeoTag(t *testing.T) {
const largeGeoTag = "za-lorem-ipsum-donor-b-blah-lorem"
const largeGeoTag = "za-lorem-ipsum-donor-b-blah-lorem-blah-blah-blah-blah-blah"
defer cleanup()
// arrange
customConfig := predefinedConfig
Expand All @@ -1278,10 +1278,11 @@ func TestNsServerNamesWithLargeExtClusterGeoTag(t *testing.T) {

// assert
assert.Error(t, err)
assert.Equal(t, "gslb-ns-us-k8gb-test-preprod-gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t, "gslb-ns-us.k8gb-test-preprod.gslb.cloud.example.com", config.GetClusterNSName())
extNsNames := config.GetExternalClusterNSNames()
expectedExtNsNames := map[string]string{largeGeoTag: "gslb-ns-za-lorem-ipsum-donor-b-blah-lorem-k8gb-test-preprod-gslb.cloud.example.com",
"eu": "gslb-ns-eu-k8gb-test-preprod-gslb.cloud.example.com"}
expectedExtNsNames := map[string]string{
largeGeoTag: "gslb-ns-za-lorem-ipsum-donor-b-blah-lorem-blah-blah-blah-blah-blah.k8gb-test-preprod.gslb.cloud.example.com",
"eu": "gslb-ns-eu.k8gb-test-preprod.gslb.cloud.example.com"}
assert.True(t, reflect.DeepEqual(extNsNames, expectedExtNsNames), "maps must be equal: \n %v\n %v", extNsNames, expectedExtNsNames)

}
Expand All @@ -1292,7 +1293,7 @@ func TestNsServerNamesWithLargeClusterGeoTag(t *testing.T) {
customConfig := predefinedConfig
customConfig.DNSZone = defaultDNSZone
customConfig.EdgeDNSZone = defaultEdgeDNSZone
customConfig.ClusterGeoTag = "us-lorem-ipsum-donor-blah-blah-blah-blah"
customConfig.ClusterGeoTag = "us-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah-blah-blah"
configureEnvVar(customConfig)
resolver := NewDependencyResolver()

Expand All @@ -1301,10 +1302,12 @@ func TestNsServerNamesWithLargeClusterGeoTag(t *testing.T) {

// assert
assert.Error(t, err)
assert.Equal(t, "gslb-ns-us-lorem-ipsum-donor-blah-blah-blah-blah-k8gb-test-preprod-gslb.cloud.example.com", config.GetClusterNSName())
assert.Equal(t,
"gslb-ns-us-lorem-ipsum-donor-blah-blah-blah-blah-blah-blah-blah-blah.k8gb-test-preprod.gslb.cloud.example.com",
config.GetClusterNSName())
extNsNames := config.GetExternalClusterNSNames()
expectedExtNsNames := map[string]string{"za": "gslb-ns-za-k8gb-test-preprod-gslb.cloud.example.com",
"eu": "gslb-ns-eu-k8gb-test-preprod-gslb.cloud.example.com"}
expectedExtNsNames := map[string]string{"za": "gslb-ns-za.k8gb-test-preprod.gslb.cloud.example.com",
"eu": "gslb-ns-eu.k8gb-test-preprod.gslb.cloud.example.com"}
assert.True(t, reflect.DeepEqual(extNsNames, expectedExtNsNames), "maps must be equal: \n %v\n %v", extNsNames, expectedExtNsNames)

}
Expand Down
8 changes: 4 additions & 4 deletions controllers/gslb_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,13 +786,13 @@ func TestCreatesDNSNSRecordsForExtDNS(t *testing.T) {
RecordTTL: 30,
RecordType: "NS",
Targets: externaldns.Targets{
"gslb-ns-eu-cloud.example.com",
"gslb-ns-us-cloud.example.com",
"gslb-ns-za-cloud.example.com",
"gslb-ns-eu.cloud.example.com",
"gslb-ns-us.cloud.example.com",
"gslb-ns-za.cloud.example.com",
},
},
{
DNSName: "gslb-ns-eu-cloud.example.com",
DNSName: "gslb-ns-eu.cloud.example.com",
RecordTTL: 30,
RecordType: "A",
Targets: externaldns.Targets{
Expand Down
6 changes: 3 additions & 3 deletions controllers/internal/utils/fakedns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ func TestFakeDNSMultipleTXTRecords(t *testing.T) {

func TestFakeDNSBasic(t *testing.T) {
NewFakeDNS(testSettings).
AddNSRecord("blah.cloud.example.com.", "gslb-ns-us-cloud.example.com.").
AddNSRecord("blah.cloud.example.com.", "gslb-ns-uk-cloud.example.com.").
AddNSRecord("blah.cloud.example.com.", "gslb-ns-eu-cloud.example.com.").
AddNSRecord("blah.cloud.example.com.", "gslb-ns-us.cloud.example.com.").
AddNSRecord("blah.cloud.example.com.", "gslb-ns-uk.cloud.example.com.").
AddNSRecord("blah.cloud.example.com.", "gslb-ns-eu.cloud.example.com.").
AddTXTRecord("First", "Second", "Banana").
AddTXTRecord("White", "Red", "Purple").
AddARecord("ip.blah.cloud.example.com.", net.IPv4(10, 0, 1, 5)).
Expand Down
8 changes: 4 additions & 4 deletions controllers/providers/dns/external_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ var a = struct {
"10.0.1.39",
},
TargetNSNamesSorted: []string{
"gslb-ns-eu-cloud.example.com",
"gslb-ns-us-cloud.example.com",
"gslb-ns-za-cloud.example.com",
"gslb-ns-eu.cloud.example.com",
"gslb-ns-us.cloud.example.com",
"gslb-ns-za.cloud.example.com",
},
}

Expand All @@ -96,7 +96,7 @@ var expectedDNSEndpoint = &externaldns.DNSEndpoint{
Targets: a.TargetNSNamesSorted,
},
{
DNSName: "gslb-ns-us-cloud.example.com",
DNSName: "gslb-ns-us.cloud.example.com",
RecordTTL: 30,
RecordType: "A",
Targets: a.TargetIPs,
Expand Down
72 changes: 36 additions & 36 deletions controllers/providers/dns/infoblox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ var (
func TestCanFilterOutDelegatedZoneEntryAccordingFQDNProvided(t *testing.T) {
// arrange
delegateTo := []ibclient.NameServer{
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za.cloud.example.com"},
}
want := []ibclient.NameServer{
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
}
customConfig := defaultConfig
customConfig.EdgeDNSZone = "example.com"
Expand All @@ -104,25 +104,25 @@ func TestCanFilterOutDelegatedZoneEntryAccordingFQDNProvided(t *testing.T) {
func TestCanSanitizeDelegatedZone(t *testing.T) {
// arrange
local := []ibclient.NameServer{
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
}
upstream := []ibclient.NameServer{
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za.cloud.example.com"},
}
want := []ibclient.NameServer{
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za.cloud.example.com"},
}
customConfig := defaultConfig
customConfig.EdgeDNSZone = "example.com"
Expand All @@ -141,20 +141,20 @@ func TestCanSanitizeDelegatedZone(t *testing.T) {

func TestSortNameServer(t *testing.T) {
delegateTo := []ibclient.NameServer{
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za.cloud.example.com"},
}
want := []ibclient.NameServer{
{Address: "10.0.0.1", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu-cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za-cloud.example.com"},
{Address: "10.0.0.1", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.2", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.0.0.3", Name: "gslb-ns-eu.cloud.example.com"},
{Address: "10.1.0.1", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.2", Name: "gslb-ns-za.cloud.example.com"},
{Address: "10.1.0.3", Name: "gslb-ns-za.cloud.example.com"},
}
sortZones(delegateTo)
assert.Equal(t, want, delegateTo, "got:\n %q \n\n want:\n %q", delegateTo, want)
Expand Down