Merge pull request #8355 from Prajyot-Parab/main

IBMCLOUD: Add new workspaces

Author: k8s-ci-robot

infra/ibmcloud/terraform/k8s-power-conformance/providers.tf

@@ -67,10 +67,3 @@ provider "ibm" {
   region           = "tok"
   zone             = "tok04"
 }
-
-provider "ibm" {
-  alias            = "powervs_osa21"
-  ibmcloud_api_key = local.key
-  region           = "osa"
-  zone             = "osa21"
-}

infra/ibmcloud/terraform/k8s-power-conformance/pvs.tf

@@ -86,24 +86,24 @@ module "powervs_workspace_tok04" {
   image_name        = var.image_name
 }
 
-module "powervs_workspace_osa21_1" {
+module "powervs_workspace_lon04_1" {
   providers = {
-    ibm = ibm.powervs_osa21
+    ibm = ibm.powervs_lon04
   }
   source            = "./modules/pvs_workspace"
-  datacenter        = "osa21"
-  pi_workspace_name = "k8s-boskos-powervs-osa21-01"
+  datacenter        = "lon04"
+  pi_workspace_name = "k8s-boskos-powervs-lon04-01"
   resource_group_id = module.resource_group.k8s_rg_id
   image_name        = var.image_name
 }
 
-module "powervs_workspace_osa21_2" {
+module "powervs_workspace_lon04_2" {
   providers = {
-    ibm = ibm.powervs_osa21
+    ibm = ibm.powervs_lon04
   }
   source            = "./modules/pvs_workspace"
-  datacenter        = "osa21"
-  pi_workspace_name = "k8s-boskos-powervs-osa21-02"
+  datacenter        = "lon04"
+  pi_workspace_name = "k8s-boskos-powervs-lon04-02"
   resource_group_id = module.resource_group.k8s_rg_id
   image_name        = var.image_name
 }

kubernetes/ibm-ppc64le/prow/boskos-resources-configmap.yaml

@@ -4,9 +4,9 @@ data:
     resources:
     - names:
       - k8s-boskos-powervs-lon04
+      - k8s-boskos-powervs-lon04-01
+      - k8s-boskos-powervs-lon04-02
       - k8s-boskos-powervs-lon06
-      - k8s-boskos-powervs-osa21-01
-      - k8s-boskos-powervs-osa21-02
       - k8s-boskos-powervs-sao01
       - k8s-boskos-powervs-syd04
       - k8s-boskos-powervs-syd05