kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from justinsb/fix_delete_with_multiple_zones 

Fix issue with deleting DNS records when multiple matching zones found
This commit is contained in:
Justin Santa Barbara 2016-08-20 01:23:55 -04:00 committed by GitHub
parent c56b7a5423 a7ece228fb
commit dee11a2953
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
upup/pkg/kutil/delete_cluster.go
View File

@ -1386,7 +1386,7 @@ func deleteRoute53Records(cloud fi.Cloud, zone *route53.HostedZone, trackers []*
ResourceRecordSet: tracker.obj.(*route53.ResourceRecordSet),
})
}
human := strings.Join(names, ",")
human := strings.Join(names, ", ")
glog.V(2).Infof("Deleting route53 records %q", human)
changeBatch := &route53.ChangeBatch{
@ -1433,7 +1433,10 @@ func ListRoute53Records(cloud fi.Cloud, clusterName string) ([]*ResourceTracker,
var trackers []*ResourceTracker
for _, zone := range zones {
for i := range zones {
// Be super careful becasue we close over this later (in groupDeleter)
zone := zones[i]
hostedZoneID := strings.TrimPrefix(aws.StringValue(zone.Id), "/hostedzone/")
glog.V(2).Infof("Querying for records in zone: %q", aws.StringValue(zone.Name))