mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-09-20 15:41:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(endpoint): debug message when owner label is missing (#5788)

Browse Source 
* fix: debug message of FilterEndpointsByOwnerID in case owner label is missing

* more consistent messages

* add unit test for changed debug message

---------

Co-authored-by: Pascal Bachor <bachorp@users.noreply.github.com>
This commit is contained in:
Pascal Bachor 2025-09-10 09:22:03 +02:00 committed by GitHub
parent bd2f8a47d2
commit 90ed615ad5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
endpoint/endpoint.go
View File

@ -378,8 +378,11 @@ func (e *Endpoint) Describe() string {
func FilterEndpointsByOwnerID(ownerID string, eps []*Endpoint) []*Endpoint {
filtered := []*Endpoint{}
for _, ep := range eps {
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)
endpointOwner, ok := ep.Labels[OwnerLabelKey]
if !ok {
log.Debugf(`Skipping endpoint %v because of missing owner label (required: "%s")`, ep, ownerID)
} else if 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)
}

62
internal/testutils/endpoint_test.go
View File

@ -23,6 +23,8 @@ import (
"sort"
"testing"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/external-dns/endpoint"
)
@ -489,3 +491,63 @@ func TestWithLabel(t *testing.T) {
assert.Equal(t, "orig", e.Labels["existing"])
assert.Equal(t, "val", e.Labels["new"])
}
func TestFilterEndpointsByOwnerIDLogging(t *testing.T) {
noOwner := &endpoint.Endpoint{}
ownedByFoo := &endpoint.Endpoint{
Labels: endpoint.Labels{
endpoint.OwnerLabelKey: "foo",
},
}
ownedByBar := &endpoint.Endpoint{
Labels: endpoint.Labels{
endpoint.OwnerLabelKey: "bar",
},
}
tests := []struct {
name string
ownerID string
endpoints []*endpoint.Endpoint
messages []string
messages_not []string
result []*endpoint.Endpoint
}{
{
name: "one_matches",
ownerID: "foo",
endpoints: []*endpoint.Endpoint{ownedByFoo},
messages: []string{},
messages_not: []string{""},
result: []*endpoint.Endpoint{ownedByFoo},
},
{
name: "wrong_owner",
ownerID: "foo",
endpoints: []*endpoint.Endpoint{ownedByFoo, ownedByBar},
messages: []string{"because owner id does not match"},
messages_not: []string{},
result: []*endpoint.Endpoint{ownedByFoo},
},
{
name: "no_owner",
ownerID: "bar",
endpoints: []*endpoint.Endpoint{noOwner, ownedByBar},
messages: []string{"because of missing owner label"},
messages_not: []string{"because owner id does not match"},
result: []*endpoint.Endpoint{ownedByBar},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
hook := LogsUnderTestWithLogLevel(log.DebugLevel, t)
endpoint.FilterEndpointsByOwnerID(tt.ownerID, tt.endpoints)
for _, m := range tt.messages {
TestHelperLogContains(m, hook, t)
}
for _, m := range tt.messages_not {
TestHelperLogNotContains(m, hook, t)
}
})
}
}