Skip to content

Commit fe2cbc7

Browse files
Merge branch 'main' into 16039/monolith-terraform
2 parents 36ccc09 + f33b06f commit fe2cbc7

File tree

29 files changed

+521
-396
lines changed

29 files changed

+521
-396
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Primary owner should be listed first in list of global owners, follwed by any secondary owners
2-
* @toddgiguere @Aashiq-J
2+
* @vkuma17 @Aashiq-J

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ on:
55
issue_comment:
66
types:
77
- created
8+
89
jobs:
910
call-terraform-ci-pipeline:
10-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.0
1112
secrets: inherit
12-
with:
13-
craSCCv2: true
14-
craConfigYamlFile: "cra-config.yaml"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ on:
88

99
jobs:
1010
call-terraform-release-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.0
1212
secrets: inherit

.secrets.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-10-10T12:27:13Z",
6+
"generated_at": "2025-11-07T15:07:08Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
8282
"hashed_secret": "8196b86ede820e665b2b8af9c648f4996be99838",
8383
"is_secret": false,
8484
"is_verified": false,
85-
"line_number": 91,
85+
"line_number": 93,
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ Optionally, you need the following permissions to attach Access Management tags
304304
| <a name="module_attach_sg_to_lb"></a> [attach\_sg\_to\_lb](#module\_attach\_sg\_to\_lb) | terraform-ibm-modules/security-group/ibm | 2.8.0 |
305305
| <a name="module_attach_sg_to_master_vpe"></a> [attach\_sg\_to\_master\_vpe](#module\_attach\_sg\_to\_master\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 |
306306
| <a name="module_attach_sg_to_registry_vpe"></a> [attach\_sg\_to\_registry\_vpe](#module\_attach\_sg\_to\_registry\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 |
307-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.7 |
308-
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.5.1 |
309-
| <a name="module_existing_secrets_manager_instance_parser"></a> [existing\_secrets\_manager\_instance\_parser](#module\_existing\_secrets\_manager\_instance\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.2.0 |
307+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.34.0 |
308+
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.7.0 |
309+
| <a name="module_existing_secrets_manager_instance_parser"></a> [existing\_secrets\_manager\_instance\_parser](#module\_existing\_secrets\_manager\_instance\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.0 |
310310
| <a name="module_worker_pools"></a> [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a |
311311
312312
### Resources

cra-config.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

cra-tf-validate-ignore-rules.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/advanced/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ locals {
2222

2323
module "kp_all_inclusive" {
2424
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
25-
version = "5.4.5"
25+
version = "5.5.0"
2626
key_protect_instance_name = "${var.prefix}-kp-instance"
2727
resource_group_id = module.resource_group.resource_group_id
2828
region = var.region
@@ -234,7 +234,7 @@ locals {
234234

235235
module "cloud_logs" {
236236
source = "terraform-ibm-modules/cloud-logs/ibm"
237-
version = "1.9.5"
237+
version = "1.10.0"
238238
resource_group_id = module.resource_group.resource_group_id
239239
region = var.region
240240
plan = "standard"
@@ -243,7 +243,7 @@ module "cloud_logs" {
243243

244244
module "trusted_profile" {
245245
source = "terraform-ibm-modules/trusted-profile/ibm"
246-
version = "3.1.1"
246+
version = "3.2.0"
247247
trusted_profile_name = "${var.prefix}-profile"
248248
trusted_profile_description = "Logs agent Trusted Profile"
249249
# As a `Sender`, you can send logs to your IBM Cloud Logs service instance - but not query or tail logs. This role is meant to be used by agents and routers sending logs.
@@ -270,7 +270,7 @@ module "trusted_profile" {
270270
module "logs_agents" {
271271
depends_on = [module.kube_audit]
272272
source = "terraform-ibm-modules/logs-agent/ibm"
273-
version = "1.10.0"
273+
version = "1.15.1"
274274
cluster_id = module.ocp_base.cluster_id
275275
cluster_resource_group_id = module.resource_group.resource_group_id
276276
logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id

examples/fscloud/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "resource_group" {
1616

1717
module "cos_fscloud" {
1818
source = "terraform-ibm-modules/cos/ibm"
19-
version = "10.5.1"
19+
version = "10.7.0"
2020
resource_group_id = module.resource_group.resource_group_id
2121
create_cos_bucket = false
2222
cos_instance_name = "${var.prefix}-cos"
@@ -30,7 +30,7 @@ module "cos_fscloud" {
3030

3131
module "flowlogs_bucket" {
3232
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
33-
version = "10.5.1"
33+
version = "10.7.0"
3434

3535
bucket_configs = [
3636
{
@@ -52,7 +52,7 @@ module "flowlogs_bucket" {
5252
module "vpc" {
5353
depends_on = [module.flowlogs_bucket]
5454
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
55-
version = "8.7.0"
55+
version = "8.9.2"
5656
resource_group_id = module.resource_group.resource_group_id
5757
region = var.region
5858
prefix = var.prefix
@@ -112,7 +112,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {
112112

113113
module "cbr_vpc_zone" {
114114
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
115-
version = "1.33.7"
115+
version = "1.34.0"
116116
name = "${var.prefix}-VPC-network-zone"
117117
zone_description = "CBR Network zone representing VPC"
118118
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -124,7 +124,7 @@ module "cbr_vpc_zone" {
124124

125125
module "cbr_zone_schematics" {
126126
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
127-
version = "1.33.7"
127+
version = "1.34.0"
128128
name = "${var.prefix}-schematics-zone"
129129
zone_description = "CBR Network zone containing Schematics"
130130
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -139,7 +139,7 @@ module "cbr_zone_schematics" {
139139

140140
module "cbr_rules" {
141141
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
142-
version = "1.33.7"
142+
version = "1.34.0"
143143
rule_description = "${var.prefix} rule for vpc flow log access to cos"
144144
enforcement_mode = "enabled"
145145
resources = [{

examples/multiple_mzr_clusters/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ data "ibm_container_cluster_config" "cluster_config_c2" {
173173

174174
module "monitoring_instance" {
175175
source = "terraform-ibm-modules/cloud-monitoring/ibm"
176-
version = "1.10.2"
176+
version = "1.11.0"
177177
resource_group_id = module.resource_group.resource_group_id
178178
region = var.region
179179
plan = "graduated-tier"
@@ -190,7 +190,7 @@ module "monitoring_agent_1" {
190190
helm = helm.helm_cluster_1
191191
}
192192
source = "terraform-ibm-modules/monitoring-agent/ibm"
193-
version = "1.12.0"
193+
version = "1.16.2"
194194
cluster_id = module.ocp_base_cluster_1.cluster_id
195195
cluster_resource_group_id = module.resource_group.resource_group_id
196196
access_key = module.monitoring_instance.access_key
@@ -202,7 +202,7 @@ module "monitoring_agent_2" {
202202
helm = helm.helm_cluster_2
203203
}
204204
source = "terraform-ibm-modules/monitoring-agent/ibm"
205-
version = "1.12.0"
205+
version = "1.16.2"
206206
cluster_id = module.ocp_base_cluster_2.cluster_id
207207
cluster_resource_group_id = module.resource_group.resource_group_id
208208
access_key = module.monitoring_instance.access_key

0 commit comments

Comments
 (0)