Skip to content

Commit ec7ccc9

Browse files
authored
Merge branch 'main' into 16658_workerpools_validation
2 parents 47b8dc7 + 0ad1a56 commit ec7ccc9

File tree

20 files changed

+138
-260
lines changed

20 files changed

+138
-260
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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ Optionally, you need the following permissions to attach Access Management tags
302302
| <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 |
303303
| <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 |
304304
| <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 |
305-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.7 |
306-
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.5.1 |
307-
| <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 |
305+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.8 |
306+
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.5.8 |
307+
| <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 |
308308
| <a name="module_worker_pools"></a> [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a |
309309
310310
### Resources

examples/advanced/main.tf

Lines changed: 3 additions & 3 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.4.10"
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.9.12"
238238
resource_group_id = module.resource_group.resource_group_id
239239
region = var.region
240240
plan = "standard"
@@ -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.13.0"
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.5.8"
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.5.8"
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.8.4"
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.33.8"
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.33.8"
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.33.8"
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.10.8"
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.13.0"
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.13.0"
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)