mirror of
https://github.com/kubernetes-sigs/external-dns.git
synced 2025-08-06 17:46:57 +02:00
5d54849699
* 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
82 lines
2.4 KiB
Go
82 lines
2.4 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 testutils
|
|
|
|
import (
|
|
"sort"
|
|
|
|
"github.com/kubernetes-incubator/external-dns/endpoint"
|
|
)
|
|
|
|
/** test utility functions for endpoints verifications */
|
|
|
|
type byAllFields []*endpoint.Endpoint
|
|
|
|
func (b byAllFields) Len() int { return len(b) }
|
|
func (b byAllFields) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
|
|
func (b byAllFields) Less(i, j int) bool {
|
|
if b[i].DNSName < b[j].DNSName {
|
|
return true
|
|
}
|
|
if b[i].DNSName == b[j].DNSName {
|
|
// This rather bad, we need a more complex comparison for Targets, which considers all elements
|
|
if b[i].Targets.Same(b[j].Targets) {
|
|
return b[i].RecordType <= b[j].RecordType
|
|
}
|
|
return b[i].Targets.String() <= b[j].Targets.String()
|
|
|
|
}
|
|
return false
|
|
}
|
|
|
|
// SameEndpoint returns true if two endpoints are same
|
|
// considers example.org. and example.org DNSName/Target as different endpoints
|
|
func SameEndpoint(a, b *endpoint.Endpoint) bool {
|
|
return a.DNSName == b.DNSName && a.Targets.Same(b.Targets) && a.RecordType == b.RecordType &&
|
|
a.Labels[endpoint.OwnerLabelKey] == b.Labels[endpoint.OwnerLabelKey] && a.RecordTTL == b.RecordTTL &&
|
|
a.Labels[endpoint.ResourceLabelKey] == b.Labels[endpoint.ResourceLabelKey]
|
|
}
|
|
|
|
// SameEndpoints compares two slices of endpoints regardless of order
|
|
// [x,y,z] == [z,x,y]
|
|
// [x,x,z] == [x,z,x]
|
|
// [x,y,y] != [x,x,y]
|
|
// [x,x,x] != [x,x,z]
|
|
func SameEndpoints(a, b []*endpoint.Endpoint) bool {
|
|
if len(a) != len(b) {
|
|
return false
|
|
}
|
|
|
|
sa := a[:]
|
|
sb := b[:]
|
|
sort.Sort(byAllFields(sa))
|
|
sort.Sort(byAllFields(sb))
|
|
|
|
for i := range sa {
|
|
if !SameEndpoint(sa[i], sb[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
// SamePlanChanges verifies that two set of changes are the same
|
|
func SamePlanChanges(a, b map[string][]*endpoint.Endpoint) bool {
|
|
return SameEndpoints(a["Create"], b["Create"]) && SameEndpoints(a["Delete"], b["Delete"]) &&
|
|
SameEndpoints(a["UpdateOld"], b["UpdateOld"]) && SameEndpoints(a["UpdateNew"], b["UpdateNew"])
|
|
}
|