Skip to content

Bug 1965969: aws: Fix dns destroy logs #5494

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 3 commits into from
Jan 8, 2022
Merged

Bug 1965969: aws: Fix dns destroy logs #5494

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e73de8
Revert "aws: Output public zone id correctly when deleting hosted dns…
squidboylan Dec 14, 2021
cf57dc9
aws: Fix dns destroy logs
squidboylan Dec 16, 2021
38d2f62
Refactor for simplicity
squidboylan Dec 17, 2021
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
16 changes: 7 additions & 9 deletions pkg/destroy/aws/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ func (o *ClusterUninstaller) cleanSharedRoute53(ctx context.Context, session *se
if err != nil {
return err
}
logger = logger.WithField("id", id)

switch resourceType {
case "hostedzone":
Expand All @@ -202,7 +203,6 @@ func (o *ClusterUninstaller) cleanSharedHostedZone(ctx context.Context, client *
if err != nil {
return err
}
logger = logger.WithField("id", publicZoneID)

var lastError error
err = client.ListResourceRecordSetsPagesWithContext(
Expand All @@ -218,22 +218,20 @@ func (o *ClusterUninstaller) cleanSharedHostedZone(ctx context.Context, client *
if len(name) == len(dottedClusterDomain) {
continue
}
recordSetLogger := logger.WithField(
"recordset",
fmt.Sprintf("%s (%s)", aws.StringValue(recordSet.Name), aws.StringValue(recordSet.Type)),
)
recordsetFields := logrus.Fields{"recordset": fmt.Sprintf("%s (%s)", aws.StringValue(recordSet.Name), aws.StringValue(recordSet.Type))}
// delete any matching record sets in the public hosted zone
if publicZoneID != "" {
if err := deleteMatchingRecordSetInPublicZone(ctx, client, publicZoneID, recordSet, logger); err != nil {
publicZoneLogger := logger.WithField("id", publicZoneID)
if err := deleteMatchingRecordSetInPublicZone(ctx, client, publicZoneID, recordSet, publicZoneLogger); err != nil {
if lastError != nil {
logger.Debug(lastError)
publicZoneLogger.Debug(lastError)
}
lastError = errors.Wrapf(err, "deleting record set matching %#v from public zone %s", recordSet, publicZoneID)
// do not delete the record set in the private zone if the delete failed in the public zone;
// otherwise the record set in the public zone will get leaked
continue
}
recordSetLogger.Debug("Deleted from public zone")
publicZoneLogger.WithFields(recordsetFields).Debug("Deleted from public zone")
}
// delete the record set
if err := deleteRoute53RecordSet(ctx, client, id, recordSet, logger); err != nil {
Expand All @@ -242,7 +240,7 @@ func (o *ClusterUninstaller) cleanSharedHostedZone(ctx context.Context, client *
}
lastError = errors.Wrapf(err, "deleting record set %#v from zone %s", recordSet, id)
}
recordSetLogger.Debug("Deleted")
logger.WithFields(recordsetFields).Debug("Deleted from public zone")
}
return !lastPage
},
Expand Down