Update function hasClusterTag to fix issue #64230

Fixes issue #64230, by changing function hasClusterTag, in aws/tags.go, to ensure that a list of tags containing a tag with a key which matches clusterTagKey will return true even if a TagNameKubernetesClusterLegacy tag also exists in the list with a value other than the ClusterID. /sig aws

Update function hasClusterTag to fix issue #64230
0a95581d · Tim Wilfong · GitHub · b143093a · 0a95581d
Unverified Commit 0a95581d authored May 23, 2018 by Tim Wilfong Committed by GitHub May 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

tags.go pkg/cloudprovider/providers/aws/tags.go +4 -4

No files found.
--- a/pkg/cloudprovider/providers/aws/tags.go
+++ b/pkg/cloudprovider/providers/aws/tags.go
@@ -137,14 +137,14 @@ func (t *awsTagging) hasClusterTag(tags []*ec2.Tag) bool {
 	clusterTagKey := t.clusterTagKey()
 	for _, tag := range tags {
 		tagKey := aws.StringValue(tag.Key)
+                // Check if this is a newer-style cluster tag before checking if legacy tag value matches ClusterID
+		if tagKey == clusterTagKey {
+			return true
+		}
 		// For 1.6, we continue to recognize the legacy tags, for the 1.5 -> 1.6 upgrade
 		if tagKey == TagNameKubernetesClusterLegacy {
 			return aws.StringValue(tag.Value) == t.ClusterID
 		}
-
-		if tagKey == clusterTagKey {
-			return true
-		}
 	}
 	return false
 }