Merge pull request #14455 from johngmyers/ipv6-private

Need to setup topology before control plane for IPv6 private topology
kubernetes · Oct 26, 2022 · e4cd6b5 · e4cd6b5
2 parents 3687b8a + d33551c
commit e4cd6b5
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go
@@ -340,6 +340,16 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
 		return nil, err
 	}
 
+	err = setupNetworking(opt, &cluster)
+	if err != nil {
+		return nil, err
+	}
+
+	bastions, err := setupTopology(opt, &cluster, allZones)
+	if err != nil {
+		return nil, err
+	}
+
 	masters, err := setupMasters(opt, &cluster, zoneToSubnetMap)
 	if err != nil {
 		return nil, err
@@ -373,16 +383,6 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
 		return nil, err
 	}
 
-	err = setupNetworking(opt, &cluster)
-	if err != nil {
-		return nil, err
-	}
-
-	bastions, err := setupTopology(opt, &cluster, allZones)
-	if err != nil {
-		return nil, err
-	}
-
 	err = setupAPI(opt, &cluster)
 	if err != nil {
 		return nil, err