From 777f87293c6cebed446a3069b5179193406f1bfc Mon Sep 17 00:00:00 2001
From: Katie Coronado <kcoronado@google.com>
Date: Mon, 30 Apr 2018 10:58:25 -0700
Subject: [PATCH] Revert support for load balancing

These changes will be in a separate PR.
---
 cloud/google/machineactuator.go | 4 +---
 cloud/google/metadata.go        | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cloud/google/machineactuator.go b/cloud/google/machineactuator.go
index 9aad5d344e13..f4e39f4cfaaf 100644
--- a/cloud/google/machineactuator.go
+++ b/cloud/google/machineactuator.go
@@ -306,9 +306,7 @@ func (gce *GCEClient) Create(cluster *clusterv1.Cluster, machine *clusterv1.Mach
 				Items: metadataItems,
 			},
 			Tags: &compute.Tags{
-				Items: []string{
-					"https-server",
-					fmt.Sprintf("%s-worker", cluster.Name)},
+				Items: []string{"https-server"},
 			},
 			Labels:          labels,
 			ServiceAccounts: serviceAccounts,
diff --git a/cloud/google/metadata.go b/cloud/google/metadata.go
index dc90abc16630..2469b0552ed3 100644
--- a/cloud/google/metadata.go
+++ b/cloud/google/metadata.go
@@ -95,7 +95,7 @@ func init() {
 	nodeEnvironmentVarsTemplate = template.Must(template.New("nodeEnvironmentVars").Parse(nodeEnvironmentVars))
 }
 
-// TODO(kcoronado): replace with actual network args when they are added into provider config.
+// TODO(kcoronado): replace with actual network and node tag args when they are added into provider config.
 const masterEnvironmentVars = `
 #!/bin/bash
 KUBELET_VERSION={{ .Machine.Spec.Versions.Kubelet }}
@@ -111,8 +111,7 @@ SERVICE_CIDR={{ .ServiceCIDR }}
 PROJECT={{ .Project }}
 NETWORK=default
 SUBNETWORK=kubernetes
-CLUSTER_NAME={{ .Cluster.Name }}
-NODE_TAG="$CLUSTER_NAME-worker"
+NODE_TAG=worker
 `
 
 const nodeEnvironmentVars = `