try to fix tests

kubernetes-retired · Apr 24, 2018 · fa009a6 · fa009a6
1 parent e9f1ed5
commit fa009a6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/core/controlplane/cluster/cluster.go b/core/controlplane/cluster/cluster.go
@@ -128,7 +128,7 @@ func NewCluster(cfgRef *config.Cluster, opts config.StackTemplateOptions, plugin
 
 	// Import all the managed subnets from the network stack
 	var err error
-	cfg.Subnets, err = cfg.Subnets.ImportFromNetworkStack()
+	cfg.Subnets, err = cfg.Subnets.ImportFromNetworkStackRetainingNames()
 	if err != nil {
 		return nil, fmt.Errorf("failed to import subnets from network stack: %v", err)
 	}

diff --git a/model/subnets.go b/model/subnets.go
@@ -30,7 +30,20 @@ func (ss Subnets) ImportFromNetworkStack() (Subnets, error) {
 			} else {
 				result[i] = NewPublicSubnetFromFn(az, stackOutputName)
 			}
+		} else {
+			result[i] = s
 		}
 	}
 	return result, nil
 }
+
+func (ss Subnets) ImportFromNetworkStackRetainingNames() (Subnets, error) {
+	result, err := ss.ImportFromNetworkStack()
+	if err != nil {
+		return result, err
+	}
+	for i, s := range ss {
+		result[i].Name = s.Name
+	}
+	return result, nil
+}
diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go
@@ -3431,6 +3431,8 @@ worker:
 				stackTemplateOptions.RootStackTemplateTmplFile = "../../core/root/config/templates/stack-template.json"
 				stackTemplateOptions.NodePoolStackTemplateTmplFile = "../../core/nodepool/config/templates/stack-template.json"
 				stackTemplateOptions.ControlPlaneStackTemplateTmplFile = "../../core/controlplane/config/templates/stack-template.json"
+				stackTemplateOptions.NetworkStackTemplateTmplFile = "../../core/network/config/templates/stack-template.json"
+				stackTemplateOptions.EtcdStackTemplateTmplFile = "../../core/etcd/config/templates/stack-template.json"
 
 				cluster, err := root.ClusterFromConfig(providedConfig, stackTemplateOptions, false)
 				if err != nil {