Merge pull request #45168 from redbaron/fix-aws-tagging

Automatic merge from submit-queue (batch tested with PRs 43505, 45168, 46439, 46677, 46623) fix AWS tagging to add missing tags only It seems that intention of original code was to build map of missing tags and call AWS API to add just them, but due to typo full set of tags was always (re)added ```release-note NONE ```

Merge pull request #45168 from redbaron/fix-aws-tagging
5c048ac2 · Kubernetes Submit Queue · GitHub · 2269f5ca · 9ef85a7e · 5c048ac2
Commit 5c048ac2 authored Jun 01, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

tags.go pkg/cloudprovider/providers/aws/tags.go +5 -1

No files found.
--- a/pkg/cloudprovider/providers/aws/tags.go
+++ b/pkg/cloudprovider/providers/aws/tags.go
@@ -174,7 +174,11 @@ func (c *awsTagging) readRepairClusterTags(client EC2, resourceID string, lifecy
 		}
 	}

-	if err := c.createTags(client, resourceID, lifecycle, additionalTags); err != nil {
+	if len(addTags) == 0 {
+		return nil
+	}
+
+	if err := c.createTags(client, resourceID, lifecycle, addTags); err != nil {
 		return fmt.Errorf("error adding missing tags to resource %q: %v", resourceID, err)
 	}