Skip to content

dns: Improve logging of reconciliation and updates #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 26, 2020
Merged

dns: Improve logging of reconciliation and updates #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/dns/aws/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ func (m *Provider) change(record *iov1.DNSRecord, zone configv1.DNSZone, action
}
switch action {
case upsertAction:
log.Info("upserted DNS record", "record", record)
log.Info("upserted DNS record", "record", record.Spec, "zone", zone)
case deleteAction:
log.Info("deleted DNS record", "record", record)
log.Info("deleted DNS record", "record", record.Spec, "zone", zone)
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/dns/azure/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (m *provider) Ensure(record *iov1.DNSRecord, zone configv1.DNSZone) error {
})

if err == nil {
log.Info("upserted DNS record", "record", record)
log.Info("upserted DNS record", "record", record.Spec, "zone", zone)
}

return err
Expand Down Expand Up @@ -114,7 +114,7 @@ func (m *provider) Delete(record *iov1.DNSRecord, zone configv1.DNSZone) error {
})

if err == nil {
log.Info("deleted DNS record", "record", record)
log.Info("deleted DNS record", "record", record.Spec, "zone", zone)
}

return err
Expand Down
18 changes: 12 additions & 6 deletions pkg/operator/controller/dns/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ type reconciler struct {
}

func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) {
log.Info("reconciling", "request", request)

// TODO: If the new revision has changed, undefined stuff happens (resource leaks?)
dnsConfig := &configv1.DNS{}
if err := r.client.Get(context.TODO(), types.NamespacedName{Name: "cluster"}, dnsConfig); err != nil {
Expand Down Expand Up @@ -132,8 +134,10 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
updated.Status.Zones = statuses
updated.Status.ObservedGeneration = updated.Generation
if err := r.client.Status().Update(context.TODO(), updated); err != nil {
log.Error(err, "failed to update dnsrecord; will retry", "dnsrecord", record)
log.Error(err, "failed to update dnsrecord; will retry", "dnsrecord", updated)
return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
} else {
log.Info("updated dnsrecord", "dnsrecord", updated)
}
}
return result, nil
Expand All @@ -143,28 +147,30 @@ func (r *reconciler) publishRecordToZones(zones []configv1.DNSZone, record *iov1
result := reconcile.Result{}
var statuses []iov1.DNSZoneStatus
for i := range zones {
zone := zones[i]

// Only publish the record if the DNSRecord has been modified
// (which would mean the target could have changed) or its
// status does not indicate that it has already been published.
if record.Generation == record.Status.ObservedGeneration && recordIsAlreadyPublishedToZone(record, &zones[i]) {
if record.Generation == record.Status.ObservedGeneration && recordIsAlreadyPublishedToZone(record, &zone) {
log.Info("skipping zone to which the DNS record is already published", "record", record.Spec, "dnszone", zone)
continue
}

zone := zones[i]
condition := iov1.DNSZoneCondition{
Status: string(operatorv1.ConditionUnknown),
Type: iov1.DNSRecordFailedConditionType,
LastTransitionTime: metav1.Now(),
}

if err := r.dnsProvider.Ensure(record, zone); err != nil {
log.Error(err, "failed to publish DNS record to zone", "dnsrecord", record, "dnszone", zone)
log.Error(err, "failed to publish DNS record to zone", "record", record.Spec, "dnszone", zone)
condition.Status = string(operatorv1.ConditionTrue)
condition.Reason = "ProviderError"
condition.Message = fmt.Sprintf("The DNS provider failed to ensure the record: %v", err)
result.RequeueAfter = 30 * time.Second
} else {
log.Info("published DNS record to zone", "dnsrecord", record, "dnszone", zone)
log.Info("published DNS record to zone", "record", record.Spec, "dnszone", zone)
condition.Status = string(operatorv1.ConditionFalse)
condition.Reason = "ProviderSuccess"
condition.Message = "The DNS provider succeeded in ensuring the record"
Expand Down Expand Up @@ -204,7 +210,7 @@ func (r *reconciler) delete(record *iov1.DNSRecord) error {
if err != nil {
errs = append(errs, err)
} else {
log.Info("deleted dnsrecord from DNS provider", "dnsrecord", record, "zone", zone)
log.Info("deleted dnsrecord from DNS provider", "record", record.Spec, "zone", zone)
}
}
if len(errs) == 0 {
Expand Down