From bb46c3ca32d89a08ef6a7069ea68fa5b56a61c03 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 17 Jan 2017 01:25:16 -0500
Subject: [PATCH] Turn off validation that master & nodes have same topology

First step towards supporting mixed-modes.
---
 pkg/apis/kops/validation.go                 |  3 ---
 upup/pkg/fi/cloudup/populatecluster_test.go | 14 +++++++-------
 upup/pkg/fi/cloudup/tagbuilder.go           | 12 ------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkg/apis/kops/validation.go b/pkg/apis/kops/validation.go
index 723546e18a..df5a498561 100644
--- a/pkg/apis/kops/validation.go
+++ b/pkg/apis/kops/validation.go
@@ -310,9 +310,6 @@ func (c *Cluster) Validate(strict bool) error {
 				return fmt.Errorf("Invalid Masters value for Topology")
 			} else if c.Spec.Topology.Nodes != TopologyPublic && c.Spec.Topology.Nodes != TopologyPrivate {
 				return fmt.Errorf("Invalid Nodes value for Topology")
-				// Until we support other topologies - these must match
-			} else if c.Spec.Topology.Masters != c.Spec.Topology.Nodes {
-				return fmt.Errorf("Topology Nodes must match Topology Masters")
 			}
 
 		} else {
diff --git a/upup/pkg/fi/cloudup/populatecluster_test.go b/upup/pkg/fi/cloudup/populatecluster_test.go
index 42a62079b9..809561af8f 100644
--- a/upup/pkg/fi/cloudup/populatecluster_test.go
+++ b/upup/pkg/fi/cloudup/populatecluster_test.go
@@ -322,13 +322,13 @@ func TestPopulateCluster_TopologyInvalidValue_Required(t *testing.T) {
 	expectErrorFromPopulateCluster(t, c, "Topology")
 }
 
-func TestPopulateCluster_TopologyInvalidMatchingValues_Required(t *testing.T) {
-	// We can't have a bastion with public masters / nodes
-	c := buildMinimalCluster()
-	c.Spec.Topology.Masters = api.TopologyPublic
-	c.Spec.Topology.Nodes = api.TopologyPrivate
-	expectErrorFromPopulateCluster(t, c, "Topology")
-}
+//func TestPopulateCluster_TopologyInvalidMatchingValues_Required(t *testing.T) {
+//	// We can't have a bastion with public masters / nodes
+//	c := buildMinimalCluster()
+//	c.Spec.Topology.Masters = api.TopologyPublic
+//	c.Spec.Topology.Nodes = api.TopologyPrivate
+//	expectErrorFromPopulateCluster(t, c, "Topology")
+//}
 
 func TestPopulateCluster_BastionInvalidMatchingValues_Required(t *testing.T) {
 	// We can't have a bastion with public masters / nodes
diff --git a/upup/pkg/fi/cloudup/tagbuilder.go b/upup/pkg/fi/cloudup/tagbuilder.go
index 34ba4698a7..5f792889da 100644
--- a/upup/pkg/fi/cloudup/tagbuilder.go
+++ b/upup/pkg/fi/cloudup/tagbuilder.go
@@ -55,18 +55,6 @@ func buildCloudupTags(cluster *api.Cluster) (sets.String, error) {
 		return nil, fmt.Errorf("No networking mode set")
 	}
 
-	// Network Topologies
-	if cluster.Spec.Topology == nil {
-		return nil, fmt.Errorf("missing topology spec")
-	}
-	if cluster.Spec.Topology.Masters == api.TopologyPublic && cluster.Spec.Topology.Nodes == api.TopologyPublic {
-		tags.Insert("_topology_public")
-	} else if cluster.Spec.Topology.Masters == api.TopologyPrivate && cluster.Spec.Topology.Nodes == api.TopologyPrivate {
-		tags.Insert("_topology_private")
-	} else {
-		return nil, fmt.Errorf("Unable to parse topology. Unsupported topology configuration. Masters and nodes must match!")
-	}
-
 	switch cluster.Spec.CloudProvider {
 	case "gce":
 		{