mirror of
				https://github.com/kubernetes-sigs/external-dns.git
				synced 2025-11-04 04:31:00 +01:00 
			
		
		
		
	Fixes issue #4888. Include record type in dedupe key.
This commit is contained in:
		
							parent
							
								
									b2e1a607cf
								
							
						
					
					
						commit
						adb4a4fbb2
					
				@ -45,7 +45,7 @@ func (ms *dedupSource) Endpoints(ctx context.Context) ([]*endpoint.Endpoint, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for _, ep := range endpoints {
 | 
			
		||||
		identifier := ep.DNSName + " / " + ep.SetIdentifier + " / " + ep.Targets.String()
 | 
			
		||||
		identifier := ep.RecordType + " / " + ep.DNSName + " / " + ep.SetIdentifier + " / " + ep.Targets.String()
 | 
			
		||||
 | 
			
		||||
		if _, ok := collected[identifier]; ok {
 | 
			
		||||
			log.Debugf("Removing duplicate endpoint %s", ep)
 | 
			
		||||
 | 
			
		||||
@ -90,6 +90,27 @@ func testDedupEndpoints(t *testing.T) {
 | 
			
		||||
				{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"two endpoints with same dnsname, same type, and same target return one endpoint",
 | 
			
		||||
			[]*endpoint.Endpoint{
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "A", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "A", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
			},
 | 
			
		||||
			[]*endpoint.Endpoint{
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "A", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"two endpoints with same dnsname, different record type, and same target return two endpoints",
 | 
			
		||||
			[]*endpoint.Endpoint{
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "A", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "AAAA", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
			},
 | 
			
		||||
			[]*endpoint.Endpoint{
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "A", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
				{DNSName: "foo.example.org", RecordType: "AAAA", Targets: endpoint.Targets{"1.2.3.4"}},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	} {
 | 
			
		||||
		t.Run(tc.title, func(t *testing.T) {
 | 
			
		||||
			mockSource := new(testutils.MockSource)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user