mirror of
				https://github.com/kubernetes-sigs/external-dns.git
				synced 2025-11-04 12:41:00 +01: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
		
			
				
	
	
		
			121 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			121 lines
		
	
	
		
			3.5 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 source
 | 
						|
 | 
						|
import (
 | 
						|
	"errors"
 | 
						|
	"testing"
 | 
						|
 | 
						|
	"github.com/kubernetes-incubator/external-dns/endpoint"
 | 
						|
	"github.com/kubernetes-incubator/external-dns/internal/testutils"
 | 
						|
 | 
						|
	"github.com/stretchr/testify/assert"
 | 
						|
	"github.com/stretchr/testify/require"
 | 
						|
)
 | 
						|
 | 
						|
func TestMultiSource(t *testing.T) {
 | 
						|
	t.Run("Interface", testMultiSourceImplementsSource)
 | 
						|
	t.Run("Endpoints", testMultiSourceEndpoints)
 | 
						|
	t.Run("EndpointsWithError", testMultiSourceEndpointsWithError)
 | 
						|
}
 | 
						|
 | 
						|
// testMultiSourceImplementsSource tests that multiSource is a valid Source.
 | 
						|
func testMultiSourceImplementsSource(t *testing.T) {
 | 
						|
	assert.Implements(t, (*Source)(nil), new(multiSource))
 | 
						|
}
 | 
						|
 | 
						|
// testMultiSourceEndpoints tests merged endpoints from children are returned.
 | 
						|
func testMultiSourceEndpoints(t *testing.T) {
 | 
						|
	foo := &endpoint.Endpoint{DNSName: "foo", Targets: endpoint.Targets{"8.8.8.8"}}
 | 
						|
	bar := &endpoint.Endpoint{DNSName: "bar", Targets: endpoint.Targets{"8.8.4.4"}}
 | 
						|
 | 
						|
	for _, tc := range []struct {
 | 
						|
		title           string
 | 
						|
		nestedEndpoints [][]*endpoint.Endpoint
 | 
						|
		expected        []*endpoint.Endpoint
 | 
						|
	}{
 | 
						|
		{
 | 
						|
			"no child sources return no endpoints",
 | 
						|
			nil,
 | 
						|
			[]*endpoint.Endpoint{},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			"single empty child source returns no endpoints",
 | 
						|
			[][]*endpoint.Endpoint{{}},
 | 
						|
			[]*endpoint.Endpoint{},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			"single non-empty child source returns child's endpoints",
 | 
						|
			[][]*endpoint.Endpoint{{foo}},
 | 
						|
			[]*endpoint.Endpoint{foo},
 | 
						|
		},
 | 
						|
		{
 | 
						|
			"multiple non-empty child sources returns merged children's endpoints",
 | 
						|
			[][]*endpoint.Endpoint{{foo}, {bar}},
 | 
						|
			[]*endpoint.Endpoint{foo, bar},
 | 
						|
		},
 | 
						|
	} {
 | 
						|
		t.Run(tc.title, func(t *testing.T) {
 | 
						|
			// Prepare the nested mock sources.
 | 
						|
			sources := make([]Source, 0, len(tc.nestedEndpoints))
 | 
						|
 | 
						|
			// Populate the nested mock sources.
 | 
						|
			for _, endpoints := range tc.nestedEndpoints {
 | 
						|
				src := new(testutils.MockSource)
 | 
						|
				src.On("Endpoints").Return(endpoints, nil)
 | 
						|
 | 
						|
				sources = append(sources, src)
 | 
						|
			}
 | 
						|
 | 
						|
			// Create our object under test and get the endpoints.
 | 
						|
			source := NewMultiSource(sources)
 | 
						|
 | 
						|
			// Get endpoints from the source.
 | 
						|
			endpoints, err := source.Endpoints()
 | 
						|
			require.NoError(t, err)
 | 
						|
 | 
						|
			// Validate returned endpoints against desired endpoints.
 | 
						|
			validateEndpoints(t, endpoints, tc.expected)
 | 
						|
 | 
						|
			// Validate that the nested sources were called.
 | 
						|
			for _, src := range sources {
 | 
						|
				src.(*testutils.MockSource).AssertExpectations(t)
 | 
						|
			}
 | 
						|
		})
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
// testMultiSourceEndpointsWithError tests that an error by a nested source is bubbled up.
 | 
						|
func testMultiSourceEndpointsWithError(t *testing.T) {
 | 
						|
	// Create the expected error.
 | 
						|
	errSomeError := errors.New("some error")
 | 
						|
 | 
						|
	// Create a mocked source returning that error.
 | 
						|
	src := new(testutils.MockSource)
 | 
						|
	src.On("Endpoints").Return(nil, errSomeError)
 | 
						|
 | 
						|
	// Create our object under test and get the endpoints.
 | 
						|
	source := NewMultiSource([]Source{src})
 | 
						|
 | 
						|
	// Get endpoints from our source.
 | 
						|
	_, err := source.Endpoints()
 | 
						|
	assert.EqualError(t, err, "some error")
 | 
						|
 | 
						|
	// Validate that the nested source was called.
 | 
						|
	src.AssertExpectations(t)
 | 
						|
}
 |