mirror of
https://github.com/kubernetes-sigs/external-dns.git
synced 2025-08-06 09:36:58 +02:00
* Endpoint.Target is now Endpoint.Targets. This is its own type representing mutliple targets for a single DNS name while adding some convenience for sorting and comparing * Made everything compile and tests run through with the new Endpoint.Targets * The ingress source can now properly handle multiple target ips per host * Added custom conflict resolver, to better understand how conflict resolution has to work for me * My custom conflict resolver behaves a bit different than the PerResource resolver, therefore I needed to modify the expected test result Removed unnecessary FIXME * The ingress source now creates CNAME endpoints with multiple targets to let the DNS provider decide how to handle multiple CNAME targets. This could be interesting for weighted targets etc. * Adopted the expected results to the new way we create endpoints for CNAMEs * Removed Add method from Targets since manipulating the slice through here is unnecessary complicated and doesn't deliver enough convenience * Reverted ConflictResolver to the original one. There is some discussing to do what the best way is to handle conflicts * Added missing documenting comment to IsLess of Targets * Added documenting comments to Targets,Targets.Same and NewTargets to clarify their intention and usage * Service source now also generates endpoints with multiple targets * Service and Ingress source now sort all Targets for every Endpoint to make order of Targets predictable * Endpoints generated by the Google Cloud DNS provider now also have sorted Targets to make order of Targets predictable * Modified provider dyn to be able to compile with multi target changes * Fixed small nitpicks, so my code is acceptable * Fixed merge method after updating to new Targets. Replacing '!=' with .Same of course needs a boolean negation * Tests for dyn provider now also use the new Targets instead of Target * Simplified extractServiceIps as implied by linki to make it more readable * ref: change service ClusterIP retrieval again * Added entry to CHANGELOG.md describing the new features contained in this PR
135 lines
3.3 KiB
Go
135 lines
3.3 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package registry
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/kubernetes-incubator/external-dns/endpoint"
|
|
"github.com/kubernetes-incubator/external-dns/internal/testutils"
|
|
"github.com/kubernetes-incubator/external-dns/plan"
|
|
"github.com/kubernetes-incubator/external-dns/provider"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
var _ Registry = &NoopRegistry{}
|
|
|
|
func TestNoopRegistry(t *testing.T) {
|
|
t.Run("NewNoopRegistry", testNoopInit)
|
|
t.Run("Records", testNoopRecords)
|
|
t.Run("ApplyChanges", testNoopApplyChanges)
|
|
}
|
|
|
|
func testNoopInit(t *testing.T) {
|
|
p := provider.NewInMemoryProvider()
|
|
r, err := NewNoopRegistry(p)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, p, r.provider)
|
|
}
|
|
|
|
func testNoopRecords(t *testing.T) {
|
|
p := provider.NewInMemoryProvider()
|
|
p.CreateZone("org")
|
|
providerRecords := []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"example-lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
}
|
|
p.ApplyChanges(&plan.Changes{
|
|
Create: providerRecords,
|
|
})
|
|
|
|
r, _ := NewNoopRegistry(p)
|
|
|
|
eps, err := r.Records()
|
|
require.NoError(t, err)
|
|
assert.True(t, testutils.SameEndpoints(eps, providerRecords))
|
|
}
|
|
|
|
func testNoopApplyChanges(t *testing.T) {
|
|
// do some prep
|
|
p := provider.NewInMemoryProvider()
|
|
p.CreateZone("org")
|
|
providerRecords := []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"old-lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
}
|
|
expectedUpdate := []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"new-example-lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
{
|
|
DNSName: "new-record.org",
|
|
Targets: endpoint.Targets{"new-lb.org"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
}
|
|
|
|
p.ApplyChanges(&plan.Changes{
|
|
Create: providerRecords,
|
|
})
|
|
|
|
// wrong changes
|
|
r, _ := NewNoopRegistry(p)
|
|
err := r.ApplyChanges(&plan.Changes{
|
|
Create: []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
},
|
|
})
|
|
assert.EqualError(t, err, provider.ErrRecordAlreadyExists.Error())
|
|
|
|
//correct changes
|
|
require.NoError(t, r.ApplyChanges(&plan.Changes{
|
|
Create: []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "new-record.org",
|
|
Targets: endpoint.Targets{"new-lb.org"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
},
|
|
UpdateNew: []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"new-example-lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
},
|
|
UpdateOld: []*endpoint.Endpoint{
|
|
{
|
|
DNSName: "example.org",
|
|
Targets: endpoint.Targets{"old-lb.com"},
|
|
RecordType: endpoint.RecordTypeCNAME,
|
|
},
|
|
},
|
|
}))
|
|
res, _ := p.Records()
|
|
assert.True(t, testutils.SameEndpoints(res, expectedUpdate))
|
|
}
|