From b68815e930e51a3ac42c7a99bd8776e9c054f146 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Tue, 28 Mar 2017 17:02:14 -0400 Subject: [PATCH] Only apply dns changes if records were removed --- upup/pkg/kutil/delete_cluster_gce.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/upup/pkg/kutil/delete_cluster_gce.go b/upup/pkg/kutil/delete_cluster_gce.go index e93cae2048..8113192c63 100644 --- a/upup/pkg/kutil/delete_cluster_gce.go +++ b/upup/pkg/kutil/delete_cluster_gce.go @@ -787,7 +787,6 @@ func (d *clusterDiscoveryGCE) deleteDNSZone(cloud fi.Cloud, r *ResourceTracker) } changeset := rrs.StartChangeset() - for _, record := range records { if record.Type() != "A" { continue @@ -812,6 +811,10 @@ func (d *clusterDiscoveryGCE) deleteDNSZone(cloud fi.Cloud, r *ResourceTracker) changeset.Remove(record) } + if changeset.IsEmpty() { + return nil + } + err = changeset.Apply() if err != nil { return fmt.Errorf("Error deleting cloud dns records: %v", err)