Skip to content

Commit 9dde2ad

Browse files
arya-girish-karya-girish-k
authored
Merge branch 'main' into 11571-issue
2 parents 333b8fc + 100a2fc commit 9dde2ad

33 files changed

+107
-43
lines changed

‎README.md‎

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

‎bastion_host.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module "teleport_config" {
4242

4343
module "bastion_host" {
4444
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
45-
version = "4.6.0"
45+
version = "4.7.1"
4646
for_each = local.bastion_vsi_map
4747
resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
4848
create_security_group = each.value.security_group == null ? false : true

‎cbr.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############################################################################
44
module "update_cbr_vpc_zone" {
55
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
6-
version = "1.29.0"
6+
version = "1.31.0"
77
count = var.existing_vpc_cbr_zone_id != null ? 1 : 0
88
use_existing_cbr_zone = true
99
existing_zone_id = var.existing_vpc_cbr_zone_id

‎cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ module "cluster" {
244244
if cluster.kube_type == "openshift"
245245
}
246246
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
247-
version = "3.44.0"
247+
version = "3.46.14"
248248
resource_group_id = local.resource_groups[each.value.resource_group]
249249
region = var.region
250250
cluster_name = each.value.cluster_name

‎examples/one-vpc-one-vsi/version.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
ibm = {
55
source = "IBM-Cloud/ibm"
6-
version = "1.76.3"
6+
version = "1.78.0"
77
}
88
}
99
}

‎examples/override-example/version.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
ibm = {
55
source = "IBM-Cloud/ibm"
6-
version = "1.76.3"
6+
version = "1.78.0"
77
}
88
}
99
}

‎f5_vsi.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ locals {
117117

118118
module "f5_vsi" {
119119
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
120-
version = "4.6.0"
120+
version = "4.7.1"
121121
for_each = local.f5_vsi_map
122122
resource_group_id = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
123123
create_security_group = each.value.security_group == null ? false : true

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ locals {
3333
# Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker.
3434
module "vpc" {
3535
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
36-
version = "7.22.8"
36+
version = "7.23.5"
3737
for_each = local.vpc_map
3838
name = each.value.prefix
3939
existing_vpc_id = each.value.existing_vpc_id

‎patterns/DA-cbr-tutorial.md‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
2+
# Configuring Landing Zone with Cloud automation for account configuration to create CBR VPC Zone
3+
4+
This tutorial provides step-by-step instructions for using the [Cloud automation for account configuration](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-account-infra-base-63641cec-6093-4b4f-b7b0-98d2f4185cd6-global?kind=terraform&format=terraform&version=93c7f855-881d-459b-8999-4567a4883f57-global) to provision a [Context-Based Restriction (CBR)](https://cloud.ibm.com/docs/account?topic=account-context-restrictions-whatis) VPC network [zone](https://cloud.ibm.com/docs/account?topic=account-context-restrictions-whatis#network-zones-whatis) and to configure `existing_vpc_cbr_zone_id` to add VPCs created by [Red Hat OpenShift Container Platform on VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-ocp-95fccffc-ae3b-42df-b6d9-80be5914d852-global), a [VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-vpc-9fc0fa64-27af-4fed-9dce-47b3640ba739-global), or a [VSI on VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-vsi-ef663980-4c71-4fac-af4f-4a510a9bcf68-global) to the [CBR VPC network zone](https://cloud.ibm.com/docs/account?topic=account-context-restrictions-whatis#vpc-attribute). The Cloud automation for account configuration creates a predefined network zones (a zone for each [service](https://github.com/terraform-ibm-modules/terraform-ibm-cbr/blob/main/modules/fscloud/README.md#input_zone_service_ref_list)) and a [VPC zone](https://github.com/terraform-ibm-modules/terraform-ibm-cbr/blob/main/modules/fscloud/README.md#input_zone_vpc_crn_list), and the objective of this tutorial is to add the VPCs created and managed by landing zone automation to the predefined [CBR VPC zone]((https://github.com/terraform-ibm-modules/terraform-ibm-cbr/blob/main/modules/fscloud/README.md#input_zone_vpc_crn_list)).
5+
6+
## Prerequisites
7+
- The Editor role on the [Projects]((https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects)) service
8+
- The Editor and Manager role on the [Schematics](https://cloud.ibm.com/docs/schematics) service
9+
- The Viewer role on the resource group for the project
10+
11+
For more information, see [Assigning users access to projects](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-access-project).
12+
13+
## Step 1: Deploy the Cloud automation for account configuration
14+
15+
1. Navigate to the IBM Cloud Catalog using this URL:
16+
[Cloud automation for account configuration](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-account-infra-base-63641cec-6093-4b4f-b7b0-98d2f4185cd6-global?kind=terraform&format=terraform&version=93c7f855-881d-459b-8999-4567a4883f57-global)
17+
18+
2. Click on **Add to [project](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects)** to start the deployment process
19+
20+
3. Configure the deployment parameters:
21+
- Enter the name for the project
22+
- Enter the description (optional)
23+
- Enter the configuration name
24+
- Select the region
25+
- Select the resource group
26+
27+
4. Review your configuration and click **Create**
28+
29+
5. Configure the required variables present under **security**, **required** and **optional** sections.
30+
31+
6. Click on deploy.
32+
33+
## Step 2: Retrieve the CBR VPC Zone ID
34+
35+
To access the **CBR VPC Zone ID**, which becomes available as an output after the Account Base DA deployment completes -
36+
37+
1. Navigate to **Account Infrastructure Base** deployment and select the configuration as shown in the reference image below.
38+
39+
![Projects Account Infrastructure Base Deployment](https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/infra-base-deployed.png)
40+
41+
2. In the **outputs** section, locate the output variable named `cbr_map_vpc_zoneid` and copy the `zone_id` value as illustrated below.
42+
43+
![Projects Account Infrastructure Base Deployment CBR Zone VPC ID Output](https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/infra-base-cbr-vpc-zone-id.png)
44+
45+
## Step 3: Configure Landing Zone with the CBR Zone ID
46+
47+
To properly configure landing zone with the retrieved CBR Zone ID -
48+
49+
1. Select the appropriate landing zone automation from one of the following options:
50+
- [Red Hat OpenShift Container Platform on VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-ocp-95fccffc-ae3b-42df-b6d9-80be5914d852-global)
51+
- [VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-vpc-9fc0fa64-27af-4fed-9dce-47b3640ba739-global)
52+
- [VSI on VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-slz-vsi-ef663980-4c71-4fac-af4f-4a510a9bcf68-global)
53+
54+
2. Configure the required variables present under **security**, **required** and **optional** sections.
55+
56+
3. Within the **optional** section, locate the field labeled `existing_vpc_cbr_zone_id` and paste the `zone_id` value copied in step 2, as shown below.
57+
58+
![Adding CBR VPC Zone ID](https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/existing_vpc_cbr_zone_id.png)
59+
60+
4. Click on deploy.
61+
62+
5. Once deployed, CBR VPC zone will contain the required VPCs IDs as shown below.
63+
64+
![CBR VPC zone containing required VPC IDs](https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/cbr-vpc-zone.png)

‎patterns/mixed/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ terraform {
88
required_providers {
99
ibm = {
1010
source = "IBM-Cloud/ibm"
11-
version = "1.76.3"
11+
version = "1.78.0"
1212
}
1313
external = {
1414
source = "hashicorp/external"
15-
version = "2.3.4"
15+
version = "2.3.5"
1616
}
1717
}
1818
}

0 commit comments

Comments
 (0)