Merge pull request #14455 from johngmyers/ipv6-private

Need to setup topology before control plane for IPv6 private topology
This commit is contained in:
Kubernetes Prow Robot 2022-10-25 23:56:36 -07:00 committed by GitHub
commit e4cd6b551b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions

View File

@ -340,6 +340,16 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
return nil, err 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) masters, err := setupMasters(opt, &cluster, zoneToSubnetMap)
if err != nil { if err != nil {
return nil, err return nil, err
@ -373,16 +383,6 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
return nil, err 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) err = setupAPI(opt, &cluster)
if err != nil { if err != nil {
return nil, err return nil, err