зеркало из https://github.com/Azure/ARO-RP.git
enable default SDNProvider when not specified
This commit is contained in:
Родитель
26cc634bd1
Коммит
d1f87dffd8
|
@ -100,6 +100,11 @@ func (m *manager) generateInstallConfig(ctx context.Context) (*installconfig.Ins
|
|||
workerZones = []string{""}
|
||||
}
|
||||
|
||||
SDNProvider := "OVNKubernetes" // or "OpenShiftSDN", this will be the default SDNProvider
|
||||
if m.doc.OpenShiftCluster.Properties.NetworkProfile.SDNProvider != "" {
|
||||
SDNProvider = string(m.doc.OpenShiftCluster.Properties.NetworkProfile.SDNProvider)
|
||||
}
|
||||
|
||||
installConfig := &installconfig.InstallConfig{
|
||||
Config: &types.InstallConfig{
|
||||
TypeMeta: metav1.TypeMeta{
|
||||
|
@ -116,7 +121,7 @@ func (m *manager) generateInstallConfig(ctx context.Context) (*installconfig.Ins
|
|||
CIDR: *ipnet.MustParseCIDR("127.0.0.0/8"), // dummy
|
||||
},
|
||||
},
|
||||
NetworkType: string(m.doc.OpenShiftCluster.Properties.NetworkProfile.SDNProvider),
|
||||
NetworkType: SDNProvider,
|
||||
ClusterNetwork: []types.ClusterNetworkEntry{
|
||||
{
|
||||
CIDR: *ipnet.MustParseCIDR(m.doc.OpenShiftCluster.Properties.NetworkProfile.PodCIDR),
|
||||
|
|
Загрузка…
Ссылка в новой задаче