Skip to content

Commit

Permalink
Revert support for load balancing
Browse files Browse the repository at this point in the history
These changes will be in a separate PR.
  • Loading branch information
kcoronado committed Apr 30, 2018
1 parent fc93913 commit 777f872
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions cloud/google/machineactuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions cloud/google/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 = `
Expand Down

0 comments on commit 777f872

Please sign in to comment.