Merge branch 'main' into fix-loadbalancer-ip

Author: vishesh92

cloudstack.go

@@ -54,6 +54,7 @@ type CSConfig struct {
 		SSLNoVerify bool   `gcfg:"ssl-no-verify"`
 		ProjectID   string `gcfg:"project-id"`
 		Zone        string `gcfg:"zone"`
+		Region      string `gcfg:"region"`
 	}
 }
 
@@ -62,6 +63,7 @@ type CSCloud struct {
 	client        *cloudstack.CloudStackClient
 	projectID     string // If non-"", all resources will be created within this project
 	zone          string
+	region        string
 	version       semver.Version
 	clientBuilder cloudprovider.ControllerClientBuilder
 }
@@ -96,6 +98,7 @@ func newCSCloud(cfg *CSConfig) (*CSCloud, error) {
 	cs := &CSCloud{
 		projectID: cfg.Global.ProjectID,
 		zone:      cfg.Global.Zone,
+		region:    cfg.Global.Region,
 		version:   semver.Version{},
 	}
 
@@ -231,7 +234,8 @@ func (cs *CSCloud) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
 
 	klog.V(2).Infof("Current zone is %v", cs.zone)
 	zone.FailureDomain = cs.zone
-	zone.Region = cs.zone
+
+	zone.Region = cs.getRegionFromZone(cs.zone)
 
 	return zone, nil
 }
@@ -253,7 +257,7 @@ func (cs *CSCloud) GetZoneByProviderID(ctx context.Context, providerID string) (
 
 	klog.V(2).Infof("Current zone is %v", cs.zone)
 	zone.FailureDomain = instance.Zonename
-	zone.Region = instance.Zonename
+	zone.Region = cs.getRegionFromZone(instance.Zonename)
 
 	return zone, nil
 }
@@ -275,7 +279,7 @@ func (cs *CSCloud) GetZoneByNodeName(ctx context.Context, nodeName types.NodeNam
 
 	klog.V(2).Infof("Current zone is %v", cs.zone)
 	zone.FailureDomain = instance.Zonename
-	zone.Region = instance.Zonename
+	zone.Region = cs.getRegionFromZone(instance.Zonename)
 
 	return zone, nil
 }
@@ -425,3 +429,10 @@ func (cs *CSCloud) patchServiceAnnotation(ctx context.Context, client kubernetes
 
 	return fmt.Errorf("failed to update service annotation after %d attempts", maxRetries)
 }
+
+func (cs *CSCloud) getRegionFromZone(zone string) string {
+	if cs.region != "" {
+		return cs.region
+	}
+	return zone
+}