Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions infra/ibmcloud/terraform/k8s-power-conformance/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,24 @@ provider "ibm" {
region = "tok"
zone = "tok04"
}

provider "ibm" {
alias = "powervs_eu_de_1"
ibmcloud_api_key = local.key
region = "eu-de"
zone = "eu-de-1"
}

provider "ibm" {
alias = "powervs_eu_de_2"
ibmcloud_api_key = local.key
region = "eu-de"
zone = "eu-de-2"
}

provider "ibm" {
alias = "powervs_tor01"
ibmcloud_api_key = local.key
region = "tor"
zone = "tor01"
}
105 changes: 36 additions & 69 deletions infra/ibmcloud/terraform/k8s-power-conformance/pvs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,134 +20,101 @@ resource "ibm_pi_key" "sshkey" {
pi_cloud_instance_id = var.service_instance_id
}

module "powervs_workspace_sao01" {
module "powervs_workspace_eu_de_1_01" {
providers = {
ibm = ibm.powervs_sao01
ibm = ibm.powervs_eu_de_1
}
source = "./modules/pvs_workspace"
datacenter = "sao01"
pi_workspace_name = "k8s-boskos-powervs-sao01"
datacenter = "eu-de-1"
pi_workspace_name = "k8s-boskos-powervs-eu-de-1-01"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon04" {
module "powervs_workspace_eu_de_1_02" {
providers = {
ibm = ibm.powervs_lon04
ibm = ibm.powervs_eu_de_1
}
source = "./modules/pvs_workspace"
datacenter = "lon04"
pi_workspace_name = "k8s-boskos-powervs-lon04"
datacenter = "eu-de-1"
pi_workspace_name = "k8s-boskos-powervs-eu-de-1-02"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon06" {
module "powervs_workspace_eu_de_1_03" {
providers = {
ibm = ibm.powervs_lon06
ibm = ibm.powervs_eu_de_1
}
source = "./modules/pvs_workspace"
datacenter = "lon06"
pi_workspace_name = "k8s-boskos-powervs-lon06"
datacenter = "eu-de-1"
pi_workspace_name = "k8s-boskos-powervs-eu-de-1-03"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon06_1" {
module "powervs_workspace_eu_de_2_01" {
providers = {
ibm = ibm.powervs_lon06
ibm = ibm.powervs_eu_de_2
}
source = "./modules/pvs_workspace"
datacenter = "lon06"
pi_workspace_name = "k8s-boskos-powervs-lon06-01"
datacenter = "eu-de-2"
pi_workspace_name = "k8s-boskos-powervs-eu-de-2-01"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon06_2" {
module "powervs_workspace_eu_de_2_02" {
providers = {
ibm = ibm.powervs_lon06
ibm = ibm.powervs_eu_de_2
}
source = "./modules/pvs_workspace"
datacenter = "lon06"
pi_workspace_name = "k8s-boskos-powervs-lon06-02"
datacenter = "eu-de-2"
pi_workspace_name = "k8s-boskos-powervs-eu-de-2-02"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_syd04" {
module "powervs_workspace_eu_de_2_03" {
providers = {
ibm = ibm.powervs_syd04
ibm = ibm.powervs_eu_de_2
}
source = "./modules/pvs_workspace"
datacenter = "syd04"
pi_workspace_name = "k8s-boskos-powervs-syd04"
datacenter = "eu-de-2"
pi_workspace_name = "k8s-boskos-powervs-eu-de-2-03"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_syd05" {
module "powervs_workspace_tor_01_1" {
providers = {
ibm = ibm.powervs_syd05
ibm = ibm.powervs_tor01
}
source = "./modules/pvs_workspace"
datacenter = "syd05"
pi_workspace_name = "k8s-boskos-powervs-syd05"
datacenter = "tor01"
pi_workspace_name = "k8s-boskos-powervs-tor01-01"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_syd05_1" {
module "powervs_workspace_tor_01_2" {
providers = {
ibm = ibm.powervs_syd05
ibm = ibm.powervs_tor01
}
source = "./modules/pvs_workspace"
datacenter = "syd05"
pi_workspace_name = "k8s-boskos-powervs-syd05-01"
datacenter = "tor01"
pi_workspace_name = "k8s-boskos-powervs-tor01-02"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_tok04" {
module "powervs_workspace_tor_01_3" {
providers = {
ibm = ibm.powervs_tok04
ibm = ibm.powervs_tor01
}
source = "./modules/pvs_workspace"
datacenter = "tok04"
pi_workspace_name = "k8s-boskos-powervs-tok04"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon04_1" {
providers = {
ibm = ibm.powervs_lon04
}
source = "./modules/pvs_workspace"
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_lon04_2" {
providers = {
ibm = ibm.powervs_lon04
}
source = "./modules/pvs_workspace"
datacenter = "lon04"
pi_workspace_name = "k8s-boskos-powervs-lon04-02"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}

module "powervs_workspace_lon04_3" {
providers = {
ibm = ibm.powervs_lon04
}
source = "./modules/pvs_workspace"
datacenter = "lon04"
pi_workspace_name = "k8s-boskos-powervs-lon04-03"
datacenter = "tor01"
pi_workspace_name = "k8s-boskos-powervs-tor01-03"
resource_group_id = module.resource_group.k8s_rg_id
image_name = var.image_name
}
9 changes: 5 additions & 4 deletions kubernetes/ibm-ppc64le/prow/boskos-resources-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ data:
- names:
- k8s-boskos-powervs-eu-de-1-01
- k8s-boskos-powervs-eu-de-1-02
- k8s-boskos-powervs-eu-de-1-03
- k8s-boskos-powervs-eu-de-2-01
- k8s-boskos-powervs-eu-de-2-02
- k8s-boskos-powervs-lon06
- k8s-boskos-powervs-lon06-01
- k8s-boskos-powervs-lon06-02
- k8s-boskos-powervs-syd04
- k8s-boskos-powervs-eu-de-2-03
- k8s-boskos-powervs-tor01-01
- k8s-boskos-powervs-tor01-02
- k8s-boskos-powervs-tor01-03
state: dirty
type: powervs
kind: ConfigMap
Expand Down