Don't need this anymore, will fix tf tomorrow.

upup/pkg/fi/cloudup/gcetasks/instancetemplate.go

@@ -45,9 +45,9 @@ type InstanceTemplate struct {
 
 	Lifecycle *fi.Lifecycle
 
-	Network     *Network
-	Tags        []string
-	Labels      map[string]string
+	Network *Network
+	Tags    []string
+	//Labels      map[string]string
 	Preemptible *bool
 
 	BootDiskImage  *string
@@ -103,7 +103,6 @@ func (e *InstanceTemplate) Find(c *fi.Context) (*InstanceTemplate, error) {
 		p := r.Properties
 
 		actual.Tags = append(actual.Tags, p.Tags.Items...)
-		actual.Labels = p.Labels
 		actual.MachineType = fi.String(lastComponent(p.MachineType))
 		actual.CanIPForward = &p.CanIpForward
 
@@ -246,17 +245,6 @@ func (e *InstanceTemplate) mapToGCE(project string, region string) (*compute.Ins
 		}
 	}
 
-	// Question: do we want to make metadata-concealment configurable?
-	// Ordering the task like this _should_ make it possible to override
-	labels := map[string]string{
-		"cloud.google.com/metadata-proxy-ready": "true",
-	}
-	if e.Labels != nil {
-		for k, v := range e.Labels {
-			labels[k] = v
-		}
-	}
-
 	var networkInterfaces []*compute.NetworkInterface
 	ni := &compute.NetworkInterface{
 		Kind: "compute#networkInterface",
@@ -327,8 +315,7 @@ func (e *InstanceTemplate) mapToGCE(project string, region string) (*compute.Ins
 
 			ServiceAccounts: serviceAccounts,
 
-			Tags:   tags,
-			Labels: labels,
+			Tags: tags,
 		},
 	}