Remove refs to `privatemasters`

cmd/kops/create_cluster.go

@@ -115,7 +115,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringVar(&options.Channel, "channel", api.DefaultChannel, "Channel for default versions and configuration to use")
 
 	// Network topology
-	cmd.Flags().StringVarP(&options.Topology, "topology", "t", "public", "Controls network topology for the cluster. public|private|privatemasters. Default is 'public'.")
+	cmd.Flags().StringVarP(&options.Topology, "topology", "t", "public", "Controls network topology for the cluster. public|private. Default is 'public'.")
 
 	return cmd
 }

pkg/apis/kops/topology.go

@@ -19,7 +19,6 @@ package kops
 const (
 	TopologyPublic         = "public"
 	TopologyPrivate        = "private"
-	TopologyPrivateMasters = "privatemasters"
 )
 
 type TopologySpec struct {

pkg/apis/kops/v1alpha1/topology.go

@@ -19,7 +19,6 @@ package v1alpha1
 const (
 	TopologyPublic         = "public"
 	TopologyPrivate        = "private"
-	TopologyPrivateMasters = "privatemasters"
 )
 
 type TopologySpec struct {

upup/models/cloudup/_aws/topologies/_topology_privatemasters/network.yaml

@@ -1 +0,0 @@
-# TODO Kris - We need to built this out - according to Chris we have a legit use case for this :)

upup/pkg/fi/cloudup/tagbuilder.go

@@ -74,8 +74,6 @@ func buildCloudupTags(cluster *api.Cluster) (map[string]struct{}, error) {
 		tags["_topology_public"] = struct{}{}
 	} else if cluster.Spec.Topology.Masters == api.TopologyPrivate && cluster.Spec.Topology.Nodes == api.TopologyPrivate {
 		tags["_topology_private"] = struct{}{}
-	} else if cluster.Spec.Topology.Masters == api.TopologyPrivate && cluster.Spec.Topology.Nodes == api.TopologyPublic {
-		tags["_topology_privatemasters"] = struct{}{}
 	} else {
 		return nil, fmt.Errorf("Unable to parse topology")
 	}