diff --git a/data/data/ibmcloud/network/main.tf b/data/data/ibmcloud/network/main.tf index 881259bf920..0e7c5a3fed1 100644 --- a/data/data/ibmcloud/network/main.tf +++ b/data/data/ibmcloud/network/main.tf @@ -1,11 +1,17 @@ locals { - resource_group_id = var.ibmcloud_resource_group_name == "" ? ibm_resource_group.group.0.id : data.ibm_resource_group.group.0.id + network_resource_group_id = var.ibmcloud_network_resource_group_name == "" ? local.resource_group_id : data.ibm_resource_group.network_group.0.id + resource_group_id = var.ibmcloud_resource_group_name == "" ? ibm_resource_group.group.0.id : data.ibm_resource_group.group.0.id } ############################################ -# Resource group +# Resource groups ############################################ +data "ibm_resource_group" "network_group" { + count = var.ibmcloud_network_resource_group_name == "" ? 0 : 1 + name = var.ibmcloud_network_resource_group_name +} + resource "ibm_resource_group" "group" { count = var.ibmcloud_resource_group_name == "" ? 1 : 0 name = var.cluster_id @@ -100,12 +106,13 @@ module "dhost" { module "vpc" { source = "./vpc" - cluster_id = var.cluster_id - public_endpoints = local.public_endpoints - resource_group_id = local.resource_group_id - tags = local.tags - zones_master = distinct(var.ibmcloud_master_availability_zones) - zones_worker = distinct(var.ibmcloud_worker_availability_zones) + cluster_id = var.cluster_id + network_resource_group_id = local.network_resource_group_id + public_endpoints = local.public_endpoints + resource_group_id = local.resource_group_id + tags = local.tags + zones_master = distinct(var.ibmcloud_master_availability_zones) + zones_worker = distinct(var.ibmcloud_worker_availability_zones) preexisting_vpc = var.ibmcloud_preexisting_vpc cluster_vpc = var.ibmcloud_vpc diff --git a/data/data/ibmcloud/network/vpc/variables.tf b/data/data/ibmcloud/network/vpc/variables.tf index 0b598f4accd..ea91bd6fc36 100644 --- a/data/data/ibmcloud/network/vpc/variables.tf +++ b/data/data/ibmcloud/network/vpc/variables.tf @@ -6,6 +6,10 @@ variable "cluster_id" { type = string } +variable "network_resource_group_id" { + type = string +} + variable "public_endpoints" { type = bool } diff --git a/data/data/ibmcloud/network/vpc/vpc.tf b/data/data/ibmcloud/network/vpc/vpc.tf index f5d665b7098..f92c1741b5d 100644 --- a/data/data/ibmcloud/network/vpc/vpc.tf +++ b/data/data/ibmcloud/network/vpc/vpc.tf @@ -5,7 +5,7 @@ resource "ibm_is_vpc" "vpc" { count = var.preexisting_vpc ? 0 : 1 name = "${local.prefix}-vpc" - resource_group = var.resource_group_id + resource_group = var.network_resource_group_id tags = var.tags } @@ -17,7 +17,7 @@ resource "ibm_is_public_gateway" "public_gateway" { count = var.preexisting_vpc ? 0 : length(local.zones_all) name = "${local.prefix}-public-gateway-${local.zones_all[count.index]}" - resource_group = var.resource_group_id + resource_group = var.network_resource_group_id tags = var.tags vpc = ibm_is_vpc.vpc[0].id zone = local.zones_all[count.index] @@ -31,7 +31,7 @@ resource "ibm_is_subnet" "control_plane" { count = var.preexisting_vpc ? 0 : length(var.zones_master) name = "${local.prefix}-subnet-control-plane-${var.zones_master[count.index]}" - resource_group = var.resource_group_id + resource_group = var.network_resource_group_id tags = var.tags vpc = ibm_is_vpc.vpc[0].id zone = var.zones_master[count.index] @@ -43,7 +43,7 @@ resource "ibm_is_subnet" "compute" { count = var.preexisting_vpc ? 0 : length(var.zones_worker) name = "${local.prefix}-subnet-compute-${var.zones_worker[count.index]}" - resource_group = var.resource_group_id + resource_group = var.network_resource_group_id tags = var.tags vpc = ibm_is_vpc.vpc[0].id zone = var.zones_worker[count.index] diff --git a/data/data/ibmcloud/variables-ibmcloud.tf b/data/data/ibmcloud/variables-ibmcloud.tf index e4782297ae2..43d6a1a2064 100644 --- a/data/data/ibmcloud/variables-ibmcloud.tf +++ b/data/data/ibmcloud/variables-ibmcloud.tf @@ -117,9 +117,19 @@ variable "ibmcloud_publish_strategy" { # } } -variable "ibmcloud_resource_group_name" { +variable "ibmcloud_network_resource_group_name" { type = string description = < github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 ## explicit; go 1.13 github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1 @@ -9565,7 +9565,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook sigs.k8s.io/controller-runtime/pkg/webhook/admission sigs.k8s.io/controller-runtime/pkg/webhook/conversion sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics -# sigs.k8s.io/controller-tools v0.9.2 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185 +# sigs.k8s.io/controller-tools v0.10.0 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185 ## explicit; go 1.13 sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/controller-tools/pkg/crd