mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2026-05-05 14:46:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for duplicated endpoints and unit tests

Browse Source
This commit is contained in:
Leonardo Quatrocchi 2024-03-29 23:27:25 -03:00
parent 7fe2d3f069
commit 2b3da1b608
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/controller.go
View File

@ -210,6 +210,7 @@ func (c *Controller) RunOnce(ctx context.Context) error {
return err
}
records = endpoint.RemoveDuplicates(records)
registryEndpointsTotal.Set(float64(len(records)))
regARecords, regAAAARecords := countAddressRecords(records)
registryARecords.Set(float64(regARecords))
@ -230,6 +231,7 @@ func (c *Controller) RunOnce(ctx context.Context) error {
verifiedARecords.Set(float64(vARecords))
verifiedAAAARecords.Set(float64(vAAAARecords))
endpoints, err = c.Registry.AdjustEndpoints(endpoints)
endpoints = endpoint.RemoveDuplicates(endpoints)
if err != nil {
return fmt.Errorf("adjusting endpoints: %w", err)
}

30
endpoint/endpoint.go
View File

@ -293,22 +293,11 @@ func (e *Endpoint) String() string {
// only endpoints that match.
func FilterEndpointsByOwnerID(ownerID string, eps []*Endpoint) []*Endpoint {
filtered := []*Endpoint{}
// Initialize the map for detecting duplicated endpoints
visited := make(map[EndpointKey]bool)
for _, ep := range eps {
key := ep.Key()
// Using EndpointKey to generate the primary key using DNSName, RecordType & SetIdentifier.
if visited[key] { //Do not contain duplicated endpoints
log.Debugf(`Skipping duplicated endpoint %v `, ep)
continue
}
if endpointOwner, ok := ep.Labels[OwnerLabelKey]; !ok || endpointOwner != ownerID {
log.Debugf(`Skipping endpoint %v because owner id does not match, found: "%s", required: "%s"`, ep, endpointOwner, ownerID)
} else {
filtered = append(filtered, ep)
visited[key] = true
log.Debugf(`Added endpoint %v because owner id matches, found: "%s", required: "%s"`, ep, endpointOwner, ownerID)
}
}
@ -354,3 +343,22 @@ type DNSEndpointList struct {
metav1.ListMeta `json:"metadata,omitempty"`
Items []DNSEndpoint `json:"items"`
}
// Apply filter based on EndpointKey (using DNSName, RecordType & SetIdentifier)
func RemoveDuplicates(filtered []*Endpoint) []*Endpoint {
visited := make(map[EndpointKey]bool)
result := []*Endpoint{}
for _, ep := range filtered {
key := ep.Key()
if !visited[key] {
result = append(result, ep)
visited[key] = true
} else {
log.Debugf(`Skipping duplicated endpoint: %v`, ep)
}
}
return result
}

20
endpoint/endpoint_test.go
View File

@ -217,7 +217,7 @@ func TestIsOwnedBy(t *testing.T) {
}
}
func TestDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
func TestDuplicatedEndpointsWithSimpleZone(t *testing.T) {
foo1 := &Endpoint{
DNSName: "foo.com",
RecordType: RecordTypeA,
@ -241,8 +241,7 @@ func TestDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
}
type args struct {
ownerID string
eps []*Endpoint
eps []*Endpoint
}
tests := []struct {
name string
@ -252,7 +251,6 @@ func TestDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
{
name: "filter values",
args: args{
ownerID: "foo",
eps: []*Endpoint{
foo1,
foo2,
@ -266,14 +264,14 @@ func TestDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := FilterEndpointsByOwnerID(tt.args.ownerID, tt.args.eps); !reflect.DeepEqual(got, tt.want) {
t.Errorf("FilterEndpointsByOwnerID() = %v, want %v", got, tt.want)
if got := RemoveDuplicates(tt.args.eps); !reflect.DeepEqual(got, tt.want) {
t.Errorf("RemoveDuplicates() = %v, want %v", got, tt.want)
}
})
}
}
func TestZonesDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
func TestDuplicatedEndpointsWithOverlappingZones(t *testing.T) {
foo1 := &Endpoint{
DNSName: "internal.foo.com",
RecordType: RecordTypeA,
@ -318,8 +316,7 @@ func TestZonesDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
}
type args struct {
ownerID string
eps []*Endpoint
eps []*Endpoint
}
tests := []struct {
name string
@ -329,7 +326,6 @@ func TestZonesDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
{
name: "filter values",
args: args{
ownerID: "foo",
eps: []*Endpoint{
foo1,
foo2,
@ -347,8 +343,8 @@ func TestZonesDuplicatedFilterEndpointsByOwnerID(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := FilterEndpointsByOwnerID(tt.args.ownerID, tt.args.eps); !reflect.DeepEqual(got, tt.want) {
t.Errorf("FilterEndpointsByOwnerID() = %v, want %v", got, tt.want)
if got := RemoveDuplicates(tt.args.eps); !reflect.DeepEqual(got, tt.want) {
t.Errorf("RemoveDuplicates() = %v, want %v", got, tt.want)
}
})
}