Skip to content

fix(deps): update dependencies and missing features in catalog #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocofaigh merged 4 commits into from
Dec 10, 2025
Merged

fix(deps): update dependencies and missing features in catalog #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
883044c
fix(deps): update dependencies
terraform-ibm-modules-ops Dec 7, 2025
7e2816e
fix(deps): update dependencies and missing features in catalog
Aashiq-J Dec 10, 2025
387b440
Merge branch 'main' into update
Aashiq-J Dec 10, 2025
06aeb58
update version in fscloud module
Aashiq-J Dec 10, 2025
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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,21 +291,21 @@ Optionally, you need the following permissions to attach Access Management tags
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.78.2, < 2.0.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.16.1, < 3.0.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 3.0.0, < 4.0.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |

### Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_attach_sg_to_api_vpe"></a> [attach\_sg\_to\_api\_vpe](#module\_attach\_sg\_to\_api\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 |
| <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 |
| <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 |
| <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 |
| <a name="module_attach_sg_to_api_vpe"></a> [attach\_sg\_to\_api\_vpe](#module\_attach\_sg\_to\_api\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.5 |
| <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.5 |
| <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.5 |
| <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.5 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.34.0 |
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.7.0 |
| <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 |
| <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.3 |
| <a name="module_worker_pools"></a> [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a |

### Resources
Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
Open in desktop
Submodule common-dev-assets updated 8 files
+11 −1 commonRenovateConfig.json
+1 −1 da-assets/da-dependency-updater/requirements.txt
+1 −1 module-assets/.pre-commit-config.yaml
+3 −0 module-assets/ci/.typos.toml
+3 −3 module-assets/ci/install-deps.sh
+92 −13 module-assets/ci/validateIbmCatalogJson.py
+1 −1 scripts/iks-api-key-reset/reset_iks_api_key.sh
+1 −1 tests/go.mod
2 changes: 1 addition & 1 deletion examples/add_rules_to_sg/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down
6 changes: 3 additions & 3 deletions examples/advanced/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand All @@ -22,7 +22,7 @@ locals {

module "kp_all_inclusive" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.0"
version = "5.5.3"
key_protect_instance_name = "${var.prefix}-kp-instance"
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down Expand Up @@ -249,7 +249,7 @@ module "cloud_logs" {

module "trusted_profile" {
source = "terraform-ibm-modules/trusted-profile/ibm"
version = "3.2.0"
version = "3.2.5"
trusted_profile_name = "${var.prefix}-profile"
trusted_profile_description = "Logs agent Trusted Profile"
# 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.
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down
2 changes: 1 addition & 1 deletion examples/cross_kms_support/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_sg/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -85,7 +85,7 @@ locals {
module "custom_sg" {
for_each = toset(["custom-cluster-sg", "custom-worker-pool-sg", "custom-lb-sg", "custom-master-vpe-sg", "custom-registry-vpe-sg", "custom-kube-api-vpe-sg"])
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
add_ibm_cloud_internal_rules = false
security_group_name = each.key
security_group_rules = []
Expand Down
6 changes: 3 additions & 3 deletions examples/fscloud/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -52,7 +52,7 @@ module "flowlogs_bucket" {
module "vpc" {
depends_on = [module.flowlogs_bucket]
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.9.2"
version = "8.10.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down Expand Up @@ -225,7 +225,7 @@ locals {
module "custom_sg" {
for_each = toset(["custom-lb-sg"])
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
add_ibm_cloud_internal_rules = false
security_group_name = each.key
security_group_rules = []
Expand Down
6 changes: 3 additions & 3 deletions examples/multiple_mzr_clusters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -193,7 +193,7 @@ module "monitoring_agent_1" {
helm = helm.helm_cluster_1
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.16.2"
version = "1.19.0"
cluster_id = module.ocp_base_cluster_1.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
Expand All @@ -205,7 +205,7 @@ module "monitoring_agent_2" {
helm = helm.helm_cluster_2
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.16.2"
version = "1.19.0"
cluster_id = module.ocp_base_cluster_2.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
Expand Down
10 changes: 5 additions & 5 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ locals {
module "attach_sg_to_lb" {
count = length(var.additional_lb_security_group_ids)
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
existing_security_group_id = var.additional_lb_security_group_ids[count.index]
use_existing_security_group_id = true
target_ids = [for index in range(var.number_of_lbs) : local.lbs_associated_with_cluster[index]] # number_of_lbs is necessary to give a static number of elements to tf to accomplish the apply when the cluster does not initially exists
Expand Down Expand Up @@ -693,7 +693,7 @@ locals {
module "attach_sg_to_master_vpe" {
count = length(var.additional_vpe_security_group_ids["master"])
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
existing_security_group_id = var.additional_vpe_security_group_ids["master"][count.index]
use_existing_security_group_id = true
target_ids = [local.master_vpe_id]
Expand All @@ -702,7 +702,7 @@ module "attach_sg_to_master_vpe" {
module "attach_sg_to_api_vpe" {
count = length(var.additional_vpe_security_group_ids["api"])
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
existing_security_group_id = var.additional_vpe_security_group_ids["api"][count.index]
use_existing_security_group_id = true
target_ids = [local.api_vpe_id]
Expand All @@ -711,7 +711,7 @@ module "attach_sg_to_api_vpe" {
module "attach_sg_to_registry_vpe" {
count = length(var.additional_vpe_security_group_ids["registry"])
source = "terraform-ibm-modules/security-group/ibm"
version = "2.8.0"
version = "2.8.5"
existing_security_group_id = var.additional_vpe_security_group_ids["registry"][count.index]
use_existing_security_group_id = true
target_ids = [local.registry_vpe_id]
Expand Down Expand Up @@ -765,7 +765,7 @@ module "cbr_rule" {
module "existing_secrets_manager_instance_parser" {
count = var.enable_secrets_manager_integration ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_secrets_manager_instance_crn
}

Expand Down
2 changes: 1 addition & 1 deletion modules/fscloud/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module "ocp_base_fscloud" {
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.78.2, < 2.0.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.16.1, < 3.0.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 3.0.0, < 4.0.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |

Expand Down
2 changes: 1 addition & 1 deletion modules/fscloud/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ terraform {
# tflint-ignore: terraform_unused_required_providers
kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.16.1, < 3.0.0"
version = ">= 3.0.0, < 4.0.0"
}
}
}
16 changes: 8 additions & 8 deletions solutions/fully-configurable/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#######################################################################################################################
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
existing_resource_group_name = var.existing_resource_group_name
}

Expand All @@ -14,21 +14,21 @@ module "resource_group" {
module "existing_kms_crn_parser" {
count = var.existing_kms_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_kms_instance_crn
}

module "existing_cluster_kms_key_crn_parser" {
count = var.existing_cluster_kms_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_cluster_kms_key_crn
}

module "existing_boot_volume_kms_key_crn_parser" {
count = var.existing_boot_volume_kms_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_boot_volume_kms_key_crn
}

Expand Down Expand Up @@ -95,7 +95,7 @@ module "kms" {
}
count = (var.kms_encryption_enabled_boot_volume && var.existing_boot_volume_kms_key_crn == null) || (var.kms_encryption_enabled_cluster && var.existing_cluster_kms_key_crn == null) ? 1 : 0
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.0"
version = "5.5.3"
create_key_protect_instance = false
region = local.cluster_kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
Expand All @@ -109,7 +109,7 @@ module "kms" {
########################################################################################################################
module "existing_vpc_crn_parser" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_vpc_crn
}

Expand Down Expand Up @@ -244,7 +244,7 @@ module "ocp_base" {
module "existing_secrets_manager_instance_parser" {
count = var.enable_secrets_manager_integration ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_secrets_manager_instance_crn
}

Expand Down Expand Up @@ -279,7 +279,7 @@ module "secret_group" {
}
count = var.enable_secrets_manager_integration && var.secrets_manager_secret_group_id == null ? 1 : 0
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.19"
version = "1.3.25"
region = module.existing_secrets_manager_instance_parser[0].region
secrets_manager_guid = module.existing_secrets_manager_instance_parser[0].service_instance
secret_group_name = module.ocp_base.cluster_id
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.85.0"
version = "1.86.0"
}
helm = {
source = "hashicorp/helm"
version = "3.1.1"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.38.0"
version = "3.0.0"
}
}
}
4 changes: 2 additions & 2 deletions solutions/quickstart/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#######################################################################################################################
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
existing_resource_group_name = var.existing_resource_group_name
}

Expand Down Expand Up @@ -67,7 +67,7 @@ locals {

module "vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.9.2"
version = "8.10.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
name = "vpc"
Expand Down
2 changes: 1 addition & 1 deletion solutions/quickstart/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.85.0"
version = "1.86.0"
}
}
}
4 changes: 2 additions & 2 deletions tests/existing-resources/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#############################################################################
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
}
Expand All @@ -14,7 +14,7 @@ module "resource_group" {

module "vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.9.2"
version = "8.10.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
name = "vpc"
Expand Down
8 changes: 3 additions & 5 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
module github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc

go 1.24.0

toolchain go1.25.4
go 1.25.5

require (
github.com/IBM/go-sdk-core/v5 v5.21.2
github.com/gruntwork-io/terratest v0.54.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.34
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.4
)

require (
Expand Down Expand Up @@ -37,7 +35,7 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.4 // indirect
github.com/go-openapi/errors v0.22.5 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
Expand Down
Loading