@@ -10,37 +10,35 @@ import (
1010 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111 "k8s.io/apimachinery/pkg/runtime"
1212
13- v1 "github.com/openshift/api/config/v1"
14- machinev1 "github.com/openshift/api/machine/v1"
1513 machineapi "github.com/openshift/api/machine/v1beta1"
1614 "github.com/openshift/installer/pkg/types"
1715 "github.com/openshift/installer/pkg/types/vsphere"
1816)
1917
2018// Machines returns a list of machines for a machinepool.
21- func Machines (clusterID string , config * types.InstallConfig , pool * types.MachinePool , osImage , role , userDataSecret string ) ([]machineapi.Machine , * machinev1. ControlPlaneMachineSet , error ) {
19+ func Machines (clusterID string , config * types.InstallConfig , pool * types.MachinePool , osImage , role , userDataSecret string ) ([]machineapi.Machine , error ) {
2220 if configPlatform := config .Platform .Name (); configPlatform != vsphere .Name {
23- return nil , nil , fmt .Errorf ("non vsphere configuration: %q" , configPlatform )
21+ return nil , fmt .Errorf ("non vsphere configuration: %q" , configPlatform )
2422 }
2523 if poolPlatform := pool .Platform .Name (); poolPlatform != vsphere .Name {
26- return nil , nil , fmt .Errorf ("non-VSphere machine-pool: %q" , poolPlatform )
24+ return nil , fmt .Errorf ("non-VSphere machine-pool: %q" , poolPlatform )
2725 }
2826
2927 var failureDomain vsphere.FailureDomain
3028 var machines []machineapi.Machine
3129 platform := config .Platform .VSphere
3230 mpool := pool .Platform .VSphere
33- replicas := int32 (1 )
31+ replicas := int64 (1 )
3432
3533 numOfZones := len (mpool .Zones )
3634
3735 zones , err := getDefinedZonesFromTopology (platform )
3836 if err != nil {
39- return machines , nil , err
37+ return machines , err
4038 }
4139
4240 if pool .Replicas != nil {
43- replicas = int32 ( * pool .Replicas )
41+ replicas = * pool .Replicas
4442 }
4543
4644 // Create hosts to populate from. Copying so we can remove without changing original
@@ -55,11 +53,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
5553 }
5654 }
5755
58- failureDomains := []machinev1.VSphereFailureDomain {}
59-
60- vsphereMachineProvider := & machineapi.VSphereMachineProviderSpec {}
61-
62- for idx := int32 (0 ); idx < replicas ; idx ++ {
56+ for idx := int64 (0 ); idx < replicas ; idx ++ {
6357 logrus .Debugf ("Creating %v machine %v" , role , idx )
6458 var host * vsphere.Host
6559 desiredZone := mpool .Zones [int (idx )% numOfZones ]
@@ -72,7 +66,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
7266 logrus .Debugf ("Desired zone: %v" , desiredZone )
7367
7468 if _ , exists := zones [desiredZone ]; ! exists {
75- return nil , nil , errors .Errorf ("zone [%s] specified by machinepool is not defined" , desiredZone )
69+ return nil , errors .Errorf ("zone [%s] specified by machinepool is not defined" , desiredZone )
7670 }
7771
7872 failureDomain = zones [desiredZone ]
@@ -83,22 +77,18 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
8377 "machine.openshift.io/cluster-api-machine-type" : role ,
8478 }
8579
86- failureDomains = append (failureDomains , machinev1.VSphereFailureDomain {
87- Name : failureDomain .Name ,
88- })
89-
9080 osImageForZone := failureDomain .Topology .Template
9181 if failureDomain .Topology .Template == "" {
9282 osImageForZone = fmt .Sprintf ("%s-%s-%s" , osImage , failureDomain .Region , failureDomain .Zone )
9383 }
9484
9585 vcenter , err := getVCenterFromServerName (failureDomain .Server , platform )
9686 if err != nil {
97- return nil , nil , errors .Wrap (err , "unable to find vCenter in failure domains" )
87+ return nil , errors .Wrap (err , "unable to find vCenter in failure domains" )
9888 }
9989 provider , err := provider (clusterID , vcenter , failureDomain , mpool , osImageForZone , userDataSecret )
10090 if err != nil {
101- return nil , nil , errors .Wrap (err , "failed to create provider" )
91+ return nil , errors .Wrap (err , "failed to create provider" )
10292 }
10393
10494 // Apply static IP if configured
@@ -122,74 +112,8 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
122112 },
123113 }
124114 machines = append (machines , machine )
125-
126- vsphereMachineProvider = provider .DeepCopy ()
127- }
128-
129- // when multiple zones are defined, network and workspace are derived from the topology
130- origProv := vsphereMachineProvider .DeepCopy ()
131- if len (failureDomains ) > 1 {
132- vsphereMachineProvider .Network = machineapi.NetworkSpec {}
133- vsphereMachineProvider .Workspace = & machineapi.Workspace {}
134- vsphereMachineProvider .Template = ""
135- }
136-
137- if len (hosts ) > 0 {
138- vsphereMachineProvider .Network .Devices = []machineapi.NetworkDeviceSpec {
139- {
140- AddressesFromPools : origProv .Network .Devices [0 ].AddressesFromPools ,
141- Nameservers : origProv .Network .Devices [0 ].Nameservers ,
142- },
143- }
144- }
145-
146- controlPlaneMachineSet := & machinev1.ControlPlaneMachineSet {
147- TypeMeta : metav1.TypeMeta {
148- APIVersion : "machine.openshift.io/v1" ,
149- Kind : "ControlPlaneMachineSet" ,
150- },
151- ObjectMeta : metav1.ObjectMeta {
152- Namespace : "openshift-machine-api" ,
153- Name : "cluster" ,
154- Labels : map [string ]string {
155- "machine.openshift.io/cluster-api-cluster" : clusterID ,
156- },
157- },
158- Spec : machinev1.ControlPlaneMachineSetSpec {
159- Replicas : & replicas ,
160- State : machinev1 .ControlPlaneMachineSetStateActive ,
161- Selector : metav1.LabelSelector {
162- MatchLabels : map [string ]string {
163- "machine.openshift.io/cluster-api-machine-role" : role ,
164- "machine.openshift.io/cluster-api-machine-type" : role ,
165- "machine.openshift.io/cluster-api-cluster" : clusterID ,
166- },
167- },
168- Template : machinev1.ControlPlaneMachineSetTemplate {
169- MachineType : machinev1 .OpenShiftMachineV1Beta1MachineType ,
170- OpenShiftMachineV1Beta1Machine : & machinev1.OpenShiftMachineV1Beta1MachineTemplate {
171- FailureDomains : & machinev1.FailureDomains {
172- Platform : v1 .VSpherePlatformType ,
173- VSphere : failureDomains ,
174- },
175- ObjectMeta : machinev1.ControlPlaneMachineSetTemplateObjectMeta {
176- Labels : map [string ]string {
177- "machine.openshift.io/cluster-api-cluster" : clusterID ,
178- "machine.openshift.io/cluster-api-machine-role" : role ,
179- "machine.openshift.io/cluster-api-machine-type" : role ,
180- },
181- },
182- Spec : machineapi.MachineSpec {
183- ProviderSpec : machineapi.ProviderSpec {
184- Value : & runtime.RawExtension {Object : vsphereMachineProvider },
185- },
186- },
187- },
188- },
189- },
190115 }
191-
192- return machines , controlPlaneMachineSet , nil
116+ return machines , nil
193117}
194118
195119// applyNetworkConfig this function will apply the static ip configuration to the networkDevice
![openshift-merge-bot[bot]](https://avatars.githubusercontent.com/in/412865?v=4&size=40){kind=avatar}
0 commit comments