Don't tag shared VPCs

Fix #4265
kubernetes · Mar 18, 2018 · 3e890a8 · 3e890a8
1 parent 98ba08f
commit 3e890a8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/model/network.go b/pkg/model/network.go
@@ -44,13 +44,17 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
 
 	// VPC that holds everything for the cluster
 	{
-
+		vpcTags := tags
+		if sharedVPC {
+			// We don't tag a shared VPC - we can identify it by its ID anyway.  Issue #4265
+			vpcTags = make(map[string]string)
+		}
 		t := &awstasks.VPC{
 			Name:             s(vpcName),
 			Lifecycle:        b.Lifecycle,
 			Shared:           fi.Bool(sharedVPC),
 			EnableDNSSupport: fi.Bool(true),
-			Tags:             tags,
+			Tags:             vpcTags,
 		}
 
 		if sharedVPC && b.IsKubernetesGTE("1.5") {