Merge pull request #987 from hamzy/PowerVS-update-supported-regions

OCPBUGS-26767: MULTIARCH-4074: PowerVS: update supported regions

Author: openshift-merge-bot[bot]

go.mod

@@ -36,6 +36,7 @@ require (
 	github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880
 	github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6
 	github.com/openshift/library-go v0.0.0-20231020125034-5a2d9fe760b3
+	github.com/ppc64le-cloud/powervs-utils v0.0.0-20240105123432-7588e9595c17
 	github.com/prometheus/client_golang v1.16.0
 	github.com/prometheus/client_model v0.4.0
 	github.com/prometheus/common v0.44.0

go.sum

@@ -954,6 +954,8 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/ppc64le-cloud/powervs-utils v0.0.0-20240105123432-7588e9595c17 h1:4Hd7ppyxQE648qShgm62PNXehIOMSOZR0V9zySJEgzE=
+github.com/ppc64le-cloud/powervs-utils v0.0.0-20240105123432-7588e9595c17/go.mod h1:KImYgHmvBVtAczNhyDBDSN54PGIdz0+QiPVQMmObEQY=
 github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
 github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

pkg/storage/ibmcos/ibmcos.go

@@ -38,6 +38,7 @@ import (
 	"github.com/openshift/cluster-image-registry-operator/pkg/envvar"
 	"github.com/openshift/cluster-image-registry-operator/pkg/storage/util"
 	"github.com/openshift/cluster-image-registry-operator/pkg/version"
+	powerUtils "github.com/ppc64le-cloud/powervs-utils"
 )
 
 const (
@@ -134,7 +135,7 @@ func (d *driver) UpdateEffectiveConfig() (*imageregistryv1.ImageRegistryConfigSt
 			clusterLocation = infra.Status.PlatformStatus.IBMCloud.Location
 		}
 		if infra.Status.PlatformStatus.Type == configapiv1.PowerVSPlatformType && infra.Status.PlatformStatus.PowerVS != nil {
-			clusterLocation, err = cosRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
+			clusterLocation, err = powerUtils.COSRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
 			if err != nil {
 				return nil, err
 			}
@@ -168,7 +169,7 @@ func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
 			d.Config.ResourceGroupName = infra.Status.PlatformStatus.IBMCloud.ResourceGroupName
 		}
 		if infra.Status.PlatformStatus.Type == configapiv1.PowerVSPlatformType && infra.Status.PlatformStatus.PowerVS != nil {
-			d.Config.Location, err = cosRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
+			d.Config.Location, err = powerUtils.COSRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
 			if err != nil {
 				return err
 			}
@@ -782,7 +783,7 @@ func (d *driver) getIBMCOSClient(serviceInstanceCRN string) (*s3.S3, error) {
 			IBMCOSLocation = infra.Status.PlatformStatus.IBMCloud.Location
 		}
 		if infra.Status.PlatformStatus.Type == configapiv1.PowerVSPlatformType && infra.Status.PlatformStatus.PowerVS != nil {
-			IBMCOSLocation, err = cosRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
+			IBMCOSLocation, err = powerUtils.COSRegionForPowerVSRegion(infra.Status.PlatformStatus.PowerVS.Region)
 			if err != nil {
 				return nil, err
 			}