Merge branch 'monthlyupdate' into ocp422

Author: shimto-jacob-siby

src/mas/devops/data/catalogs/v9-260730-amd64.yaml

@@ -5,7 +5,7 @@
 # catalog itself, but not everything in the catalog supports this yet (including MAS)
 # so we need to use the CASE bundle mirror process still.
 
-catalog_digest: sha256:3a9f89efcdefc8b0bba4deaf2efea2b17835880ba17215274637a93b30f126b0
+catalog_digest: sha256:d9ba3d2fd94d4b0b8fb1fa8eb5740a3122b137264b7da5c49818f7d9df966508
 
 ocp_compatibility:
 - "4.16"

src/mas/devops/data/catalogs/v9-260730-ppc64le.yaml

@@ -5,7 +5,7 @@
 # catalog itself, but not everything in the catalog supports this yet (including MAS)
 # so we need to use the CASE bundle mirror process still.
 
-catalog_digest: sha256:d82533f5f713fe4f9ec265009ce7d32f6094671c936a31565f98a512916205f2
+catalog_digest: sha256:40d3ec2da2fcb7a4444b4e481ad54a8a0ef2f902bb520dbf22c231a6944da265
 
 ocp_compatibility:
 - "4.16"

src/mas/devops/data/catalogs/v9-260730-s390x.yaml

@@ -5,7 +5,7 @@
 # catalog itself, but not everything in the catalog supports this yet (including MAS)
 # so we need to use the CASE bundle mirror process still.
 
-catalog_digest: sha256:d7c156afa72073c9b47773e1113a06a841d538c5c0e8878bc39bf8bd62dd5aa4
+catalog_digest: sha256:7d57ef678d387fd43344cee3d17e88207569f26071318fd74fac6e1bcff957a0
 
 ocp_compatibility:
 - "4.16"

src/mas/devops/mas/suite.py

@@ -88,10 +88,16 @@ def getDefaultStorageClasses(dynClient: DynamicClient) -> SimpleNamespace:
     for storageClass in storageClasses:
         if storageClass.metadata.name in ["ibmc-block-gold", "ibmc-file-gold-gid"]:
             result.provider = "ibmc"
-            result.providerName = "IBMCloud ROKS"
+            result.providerName = "IBMCloud ROKS Classic"
             result.rwo = "ibmc-block-gold"
             result.rwx = "ibmc-file-gold-gid"
             break
+        elif storageClass.metadata.name in ["ibmc-vpc-block-10iops-tier", "ibmc-vpc-file-1000-iops"]:
+            result.provider = "ibmc-vpc"
+            result.providerName = "IBMCloud ROKS VPC"
+            result.rwo = "ibmc-vpc-block-10iops-tier"
+            result.rwx = "ibmc-vpc-file-1000-iops"
+            break
         elif storageClass.metadata.name in [
             "ocs-storagecluster-ceph-rbd",
             "ocs-storagecluster-cephfs",