mirror of https://github.com/kubernetes/kops.git
Merge pull request #14455 from johngmyers/ipv6-private
Need to setup topology before control plane for IPv6 private topology
This commit is contained in:
commit
e4cd6b551b
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue