Merge pull request #38334 from mogthesprog/morganj/remove-azure-subnet-routetable-check

Automatic merge from submit-queue (batch tested with PRs 38638, 38334) Remove Azure Subnet RouteTable check **What this PR does / why we need it**: PR Removes the subnet configuration check for Azure cloudprovider. The subnet check ensures that the subnet is associated with the Route Table. However if the VNET is in a different Azure Resource Group then the check fails, even if the subnet is already valid. This a stop gap fix, to allow Kubernetes to be deployed to Custom VNETs in Azure, that may reside in a different resource group to the cluster. fixes #38134 @colemickens

Merge pull request #38334 from mogthesprog/morganj/remove-azure-subnet-routetable-check
0cd3cb75 · Kubernetes Submit Queue · GitHub · 911d1065 · f82e872a · 0cd3cb75
Commit 0cd3cb75 authored Dec 13, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 21 deletions

azure_routes.go pkg/cloudprovider/providers/azure/azure_routes.go +0 -21

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_routes.go
+++ b/pkg/cloudprovider/providers/azure/azure_routes.go
@@ -87,27 +87,6 @@ func (az *Cloud) CreateRoute(clusterName string, nameHint string, kubeRoute *clo
 		}
 	}
-	// ensure the subnet is properly configured
-	subnet, err := az.SubnetsClient.Get(az.ResourceGroup, az.VnetName, az.SubnetName, "")
-	if err != nil {
-		// 404 is fatal here
-		return err
-	}
-	if subnet.RouteTable != nil {
-		if *subnet.RouteTable.ID != *routeTable.ID {
-			return fmt.Errorf("The subnet has a route table, but it was unrecognized. Refusing to modify it. active_routetable=%q expected_routetable=%q", *subnet.RouteTable.ID, *routeTable.ID)
-		}
-	} else {
-		subnet.RouteTable = &network.RouteTable{
-			ID: routeTable.ID,
-		}
-		glog.V(3).Info("create: updating subnet")
-		_, err := az.SubnetsClient.CreateOrUpdate(az.ResourceGroup, az.VnetName, az.SubnetName, subnet, nil)
-		if err != nil {
-			return err
-		}
-	}
 	targetIP, err := az.getIPForMachine(kubeRoute.TargetNode)
 	if err != nil {
 		return err