Merge pull request #1311 from ish-hcc/azure_fix_zone_control

[Azure] Fixed zone control issue
cloud-barista · Sep 9, 2024 · 583deff · 583deff
2 parents 5986075 + aadb3cc
commit 583deff
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/cloud-control-manager/cloud-driver/drivers/azure/resources/DiskHandler.go b/cloud-control-manager/cloud-driver/drivers/azure/resources/DiskHandler.go
@@ -69,12 +69,22 @@ func (diskHandler *AzureDiskHandler) CreateDisk(DiskReqInfo irs.DiskInfo) (diskI
 		Location:   &diskHandler.Region.Region,
 		Tags:       tags,
 	}
+
 	// Setting zone if available
-	if diskHandler.Region.Zone != "" {
+	if DiskReqInfo.Zone != "" {
 		diskCreateOpt.Zones = []*string{
 			&DiskReqInfo.Zone,
 		}
+	} else if diskHandler.Region.TargetZone != "" {
+		diskCreateOpt.Zones = []*string{
+			&diskHandler.Region.TargetZone,
+		}
+	} else if diskHandler.Region.Zone != "" {
+		diskCreateOpt.Zones = []*string{
+			&diskHandler.Region.Zone,
+		}
 	}
+
 	poller, err := diskHandler.DiskClient.BeginCreateOrUpdate(diskHandler.Ctx, diskHandler.Region.Region, DiskReqInfo.IId.NameId, diskCreateOpt, nil)
 	if err != nil {
 		createErr = errors.New(fmt.Sprintf("Failed to Create Disk. err = %s", err.Error()))

diff --git a/cloud-control-manager/cloud-driver/drivers/azure/resources/VMHandler.go b/cloud-control-manager/cloud-driver/drivers/azure/resources/VMHandler.go
@@ -229,7 +229,11 @@ func (vmHandler *AzureVMHandler) StartVM(vmReqInfo irs.VMReqInfo) (irs.VMInfo, e
 	}
 
 	// Setting zone if available
-	if vmHandler.Region.Zone != "" {
+	if vmHandler.Region.TargetZone != "" {
+		vmOpts.Zones = []*string{
+			&vmHandler.Region.TargetZone,
+		}
+	} else if vmHandler.Region.Zone != "" {
 		vmOpts.Zones = []*string{
 			&vmHandler.Region.Zone,
 		}
@@ -999,7 +1003,6 @@ func (vmHandler *AzureVMHandler) cleanDeleteVm(vmIId irs.IID) error {
 }
 
 func (vmHandler *AzureVMHandler) mappingServerInfo(server armcompute.VirtualMachine) irs.VMInfo {
-
 	// Get Default VM Info
 	vmInfo := irs.VMInfo{
 		IId: irs.IID{
@@ -1164,7 +1167,6 @@ func (vmHandler *AzureVMHandler) mappingServerInfo(server armcompute.VirtualMach
 
 // VM 생성 시 Public IP 자동 생성 (nested flow 적용)
 func CreatePublicIP(vmHandler *AzureVMHandler, vmReqInfo irs.VMReqInfo) (irs.IID, error) {
-
 	// PublicIP 이름 생성
 	publicIPName := generatePublicIPName(vmReqInfo.IId.NameId)
 
@@ -1189,13 +1191,19 @@ func CreatePublicIP(vmHandler *AzureVMHandler, vmReqInfo irs.VMReqInfo) (irs.IID
 
 	publicIPAddressSKUNameStandard := armnetwork.PublicIPAddressSKUNameStandard
 	// Setting zone if available
-	if vmHandler.Region.Zone != "" {
+	if vmHandler.Region.TargetZone != "" || vmHandler.Region.Zone != "" {
 		createOpts.SKU = &armnetwork.PublicIPAddressSKU{
 			Name: &publicIPAddressSKUNameStandard,
 		}
 		createOpts.Properties.PublicIPAllocationMethod = &publicIPAllocationMethod
-		createOpts.Zones = []*string{
-			toStrPtr(vmHandler.Region.Zone),
+		if vmHandler.Region.TargetZone != "" {
+			createOpts.Zones = []*string{
+				toStrPtr(vmHandler.Region.TargetZone),
+			}
+		} else {
+			createOpts.Zones = []*string{
+				toStrPtr(vmHandler.Region.Zone),
+			}
 		}
 	}