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

adds soft error for google provider

Browse Source
This commit is contained in:
EWK20 2024-08-15 10:56:46 +01:00 committed by Echez Kojo
parent c4a262e6f4
commit 3f73f86da0
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
provider/google/google.go
View File

@ -194,7 +194,7 @@ func (p *GoogleProvider) Zones(ctx context.Context) (map[string]*dns.ManagedZone
log.Debugf("Matching zones against domain filters: %v", p.domainFilter) log.Debugf("Matching zones against domain filters: %v", p.domainFilter)
if err := p.managedZonesClient.List(p.project).Pages(ctx, f); err != nil { if err := p.managedZonesClient.List(p.project).Pages(ctx, f); err != nil {
return nil, err return nil, provider.NewSoftError(fmt.Errorf("failed to list zones: %w", err))
} }
if len(zones) == 0 { if len(zones) == 0 {
@ -228,7 +228,7 @@ func (p *GoogleProvider) Records(ctx context.Context) (endpoints []*endpoint.End
for _, z := range zones { for _, z := range zones {
if err := p.resourceRecordSetsClient.List(p.project, z.Name).Pages(ctx, f); err != nil { if err := p.resourceRecordSetsClient.List(p.project, z.Name).Pages(ctx, f); err != nil {
return nil, err return nil, provider.NewSoftError(fmt.Errorf("failed to list records in zone %s: %w", z.Name, err))
} }
} }
@ -302,7 +302,7 @@ func (p *GoogleProvider) submitChange(ctx context.Context, change *dns.Change) e
} }
if _, err := p.changesClient.Create(p.project, zone, c).Do(); err != nil { if _, err := p.changesClient.Create(p.project, zone, c).Do(); err != nil {
return err return provider.NewSoftError(fmt.Errorf("failed to create changes: %w", err))
} }
time.Sleep(p.batchChangeInterval) time.Sleep(p.batchChangeInterval)

11
provider/google/google_test.go
View File

@ -647,7 +647,7 @@ func validateChangeRecord(t *testing.T, record *dns.ResourceRecordSet, expected
assert.Equal(t, expected.Type, record.Type) assert.Equal(t, expected.Type, record.Type)
} }
func newGoogleProviderZoneOverlap(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, dryRun bool, records []*endpoint.Endpoint) *GoogleProvider { func newGoogleProviderZoneOverlap(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, dryRun bool, _ []*endpoint.Endpoint) *GoogleProvider {
provider := &GoogleProvider{ provider := &GoogleProvider{
project: "zalando-external-dns-test", project: "zalando-external-dns-test",
dryRun: false, dryRun: false,
@ -694,7 +694,6 @@ func newGoogleProviderZoneOverlap(t *testing.T, domainFilter endpoint.DomainFilt
Visibility: "private", Visibility: "private",
}) })
createZone(t, provider, &dns.ManagedZone{ createZone(t, provider, &dns.ManagedZone{
Name: "svc-local", Name: "svc-local",
DnsName: "svc.local.", DnsName: "svc.local.",
@ -703,10 +702,10 @@ func newGoogleProviderZoneOverlap(t *testing.T, domainFilter endpoint.DomainFilt
}) })
createZone(t, provider, &dns.ManagedZone{ createZone(t, provider, &dns.ManagedZone{
Name: "svc-local-peer", Name: "svc-local-peer",
DnsName: "svc.local.", DnsName: "svc.local.",
Id: 10006, Id: 10006,
Visibility: "private", Visibility: "private",
PeeringConfig: &dns.ManagedZonePeeringConfig{TargetNetwork: nil}, PeeringConfig: &dns.ManagedZonePeeringConfig{TargetNetwork: nil},
}) })