Skip to content

Commit f675ca2

Browse files
authored
Merge pull request rancher#88 from aiyengar2/relocate_resolve_nsg_ref
Relocate resolveNSGReference in Azure node driver
2 parents d32ea31 + 3cf91ab commit f675ca2

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

drivers/azure/azure.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,6 @@ func (d *Driver) SetConfigFromFlags(fl drivers.DriverOptions) error {
324324
d.UpdateCount = fl.Int(flAzureUpdateDomainCount)
325325
d.DiskSize = fl.Int(flAzureDiskSize)
326326
d.NSG = fl.String(flAzureNSG)
327-
var err error
328-
d.nsgUsedInPool = len(d.NSG) > 0
329-
if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
330-
return err
331-
}
332327

333328
d.ClientID = fl.String(flAzureClientID)
334329
d.ClientSecret = fl.String(flAzureClientSecret)
@@ -414,6 +409,10 @@ func (d *Driver) Create() error {
414409
}
415410
customData = base64.StdEncoding.EncodeToString(buf)
416411
}
412+
d.nsgUsedInPool = len(d.NSG) > 0
413+
if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
414+
return err
415+
}
417416

418417
if err := c.CreateResourceGroup(ctx, d.ResourceGroup, d.Location); err != nil {
419418
return err
@@ -483,6 +482,10 @@ func (d *Driver) Remove() error {
483482
if err != nil {
484483
return err
485484
}
485+
d.nsgUsedInPool = len(d.NSG) > 0
486+
if d.nsgResource, err = d.resolveNSGReference(d.NSG); err != nil {
487+
return err
488+
}
486489

487490
if err := c.DeleteVirtualMachineIfExists(ctx, d.ResourceGroup, d.naming().VM()); err != nil {
488491
return err

0 commit comments

Comments
 (0)