Ensure code is using compat.go to get region

pkg/cloud/csvprovider.go

@@ -230,7 +230,11 @@ func NodeValueFromMapField(m string, n *v1.Node, useRegion bool) string {
 	mf := strings.Split(m, ".")
 	toReturn := ""
 	if useRegion {
-		toReturn = n.Labels[v1.LabelZoneRegion] + ","
+		if region, ok := util.GetRegion(n.Labels); ok {
+			toReturn = region + ","
+		} else {
+			klog.Infof("[ERROR] Getting region based on labels failed")
+		}
 	}
 	if len(mf) == 2 && mf[0] == "spec" && mf[1] == "providerID" {
 		provIdRx := regexp.MustCompile("aws:///([^/]+)/([^/]+)") // It's of the form aws:///us-east-2a/i-0fea4fd46592d050b and we want i-0fea4fd46592d050b, if it exists

pkg/costmodel/metrics.go

@@ -970,7 +970,7 @@ func (cmme *CostModelMetricsEmitter) Start() bool {
 					klog.V(4).Infof("Unable to find parameters for storage class \"%s\". Does pv \"%s\" have a storageClassName?", pv.Spec.StorageClassName, pv.Name)
 				}
 				var region string
-				if r, ok := pv.Labels[v1.LabelZoneRegion]; ok {
+				if r, ok := util.GetRegion(pv.Labels); ok {
 					region = r
 				} else {
 					region = defaultRegion