mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 01:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(rfc2136): use correct index for accessing UpdateOld (#5542)

Browse Source
This commit is contained in:
schwajo 2025-06-30 00:00:34 +02:00 committed by GitHub
parent e467e60335
commit 495e2023a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
provider/rfc2136/rfc2136.go
View File

@ -408,9 +408,11 @@ func (r *rfc2136Provider) ApplyChanges(ctx context.Context, changes *plan.Change
zone := findMsgZone(ep, r.zoneNames)
m[zone].SetUpdate(zone)
r.UpdateRecord(m[zone], changes.UpdateOld[i], ep)
// calculate corresponding index in the unsplitted UpdateOld for current endpoint ep in chunk
j := (c * r.batchChangeSize) + i
r.UpdateRecord(m[zone], changes.UpdateOld[j], ep)
if r.createPTR && (ep.RecordType == "A" || ep.RecordType == "AAAA") {
r.RemoveReverseRecord(changes.UpdateOld[i].Targets[0], ep.DNSName)
r.RemoveReverseRecord(changes.UpdateOld[j].Targets[0], ep.DNSName)
r.AddReverseRecord(ep.Targets[0], ep.DNSName)
}
}

52
provider/rfc2136/rfc2136_test.go
View File

@ -256,6 +256,17 @@ func createRfc2136StubProviderWithStrategy(stub *rfc2136Stub, strategy string) (
return NewRfc2136Provider([]string{"rfc2136-host1", "rfc2136-host2", "rfc2136-host3"}, 0, nil, false, "key", "secret", "hmac-sha512", true, &endpoint.DomainFilter{}, false, 300*time.Second, false, false, "", "", "", 50, tlsConfig, strategy, stub)
}
func createRfc2136StubProviderWithBatchChangeSize(stub *rfc2136Stub, batchChangeSize int) (provider.Provider, error) {
tlsConfig := TLSConfig{
UseTLS: false,
SkipTLSVerify: false,
CAFilePath: "",
ClientCertFilePath: "",
ClientCertKeyFilePath: "",
}
return NewRfc2136Provider([]string{""}, 0, nil, false, "key", "secret", "hmac-sha512", true, &endpoint.DomainFilter{}, false, 300*time.Second, false, false, "", "", "", batchChangeSize, tlsConfig, "", stub)
}
func extractUpdateSectionFromMessage(msg fmt.Stringer) []string {
const searchPattern = "UPDATE SECTION:"
updateSectionOffset := strings.Index(msg.String(), searchPattern)
@ -959,3 +970,44 @@ func TestRandomLoadBalancing(t *testing.T) {
assert.Greater(t, len(nameserverCounts), 1, "Expected multiple nameservers to be used in random strategy")
}
// TestRfc2136ApplyChangesWithMultipleChunks tests Updates with multiple chunks
func TestRfc2136ApplyChangesWithMultipleChunks(t *testing.T) {
stub := newStub()
provider, err := createRfc2136StubProviderWithBatchChangeSize(stub, 2)
assert.NoError(t, err)
var oldRecords []*endpoint.Endpoint
var newRecords []*endpoint.Endpoint
for i := 1; i <= 4; i++ {
oldRecords = append(oldRecords, &endpoint.Endpoint{
DNSName: fmt.Sprintf("%s%d%s", "v", i, ".foo.com"),
RecordType: "A",
Targets: []string{fmt.Sprintf("10.0.0.%d", i)},
RecordTTL: endpoint.TTL(400),
})
newRecords = append(newRecords, &endpoint.Endpoint{
DNSName: fmt.Sprintf("%s%d%s", "v", i, ".foo.com"),
RecordType: "A",
Targets: []string{fmt.Sprintf("10.0.1.%d", i)},
RecordTTL: endpoint.TTL(400),
})
}
p := &plan.Changes{
UpdateOld: oldRecords,
UpdateNew: newRecords,
}
err = provider.ApplyChanges(context.Background(), p)
assert.NoError(t, err)
assert.Len(t, stub.updateMsgs, 4)
assert.Contains(t, stub.updateMsgs[0].String(), "\nv1.foo.com.\t0\tNONE\tA\t10.0.0.1\nv1.foo.com.\t400\tIN\tA\t10.0.1.1\n")
assert.Contains(t, stub.updateMsgs[0].String(), "\nv2.foo.com.\t0\tNONE\tA\t10.0.0.2\nv2.foo.com.\t400\tIN\tA\t10.0.1.2\n")
assert.Contains(t, stub.updateMsgs[2].String(), "\nv3.foo.com.\t0\tNONE\tA\t10.0.0.3\nv3.foo.com.\t400\tIN\tA\t10.0.1.3\n")
assert.Contains(t, stub.updateMsgs[2].String(), "\nv4.foo.com.\t0\tNONE\tA\t10.0.0.4\nv4.foo.com.\t400\tIN\tA\t10.0.1.4\n")
}