Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ Optionally, you need the following permissions to attach Access Management tags
| <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_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.7 |
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.5.1 |
| <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 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.8 |
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.5.8 |
| <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_worker_pools"></a> [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a |

### Resources
Expand Down
6 changes: 3 additions & 3 deletions examples/advanced/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ locals {

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

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.9.5"
version = "1.9.12"
resource_group_id = module.resource_group.resource_group_id
region = var.region
plan = "standard"
Expand Down Expand Up @@ -270,7 +270,7 @@ module "trusted_profile" {
module "logs_agents" {
depends_on = [module.kube_audit]
source = "terraform-ibm-modules/logs-agent/ibm"
version = "1.10.0"
version = "1.13.0"
cluster_id = module.ocp_base.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id
Expand Down
12 changes: 6 additions & 6 deletions examples/fscloud/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module "resource_group" {

module "cos_fscloud" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.5.1"
version = "10.5.8"
resource_group_id = module.resource_group.resource_group_id
create_cos_bucket = false
cos_instance_name = "${var.prefix}-cos"
Expand All @@ -30,7 +30,7 @@ module "cos_fscloud" {

module "flowlogs_bucket" {
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
version = "10.5.1"
version = "10.5.8"

bucket_configs = [
{
Expand All @@ -52,7 +52,7 @@ module "flowlogs_bucket" {
module "vpc" {
depends_on = [module.flowlogs_bucket]
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.7.0"
version = "8.8.4"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down Expand Up @@ -112,7 +112,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {

module "cbr_vpc_zone" {
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
version = "1.33.7"
version = "1.33.8"
name = "${var.prefix}-VPC-network-zone"
zone_description = "CBR Network zone representing VPC"
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
Expand All @@ -124,7 +124,7 @@ module "cbr_vpc_zone" {

module "cbr_zone_schematics" {
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
version = "1.33.7"
version = "1.33.8"
name = "${var.prefix}-schematics-zone"
zone_description = "CBR Network zone containing Schematics"
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
Expand All @@ -139,7 +139,7 @@ module "cbr_zone_schematics" {

module "cbr_rules" {
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
version = "1.33.7"
version = "1.33.8"
rule_description = "${var.prefix} rule for vpc flow log access to cos"
enforcement_mode = "enabled"
resources = [{
Expand Down
6 changes: 3 additions & 3 deletions examples/multiple_mzr_clusters/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ data "ibm_container_cluster_config" "cluster_config_c2" {

module "monitoring_instance" {
source = "terraform-ibm-modules/cloud-monitoring/ibm"
version = "1.10.2"
version = "1.10.8"
resource_group_id = module.resource_group.resource_group_id
region = var.region
plan = "graduated-tier"
Expand All @@ -190,7 +190,7 @@ module "monitoring_agent_1" {
helm = helm.helm_cluster_1
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.12.0"
version = "1.13.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 @@ -202,7 +202,7 @@ module "monitoring_agent_2" {
helm = helm.helm_cluster_2
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.12.0"
version = "1.13.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
12 changes: 5 additions & 7 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ locals {
default_ocp_version = "${data.ibm_container_cluster_versions.cluster_versions.default_openshift_version}_openshift"
ocp_version = var.ocp_version == null || var.ocp_version == "default" ? local.default_ocp_version : "${var.ocp_version}_openshift"

cos_name = var.use_existing_cos == true || (var.use_existing_cos == false && var.cos_name != null) ? var.cos_name : "${var.cluster_name}_cos"
cos_location = "global"
cos_plan = "standard"
cos_name = var.use_existing_cos == true || (var.use_existing_cos == false && var.cos_name != null) ? var.cos_name : "${var.cluster_name}_cos"
cos_plan = "standard"
# if not enable_registry_storage then set cos to 'null', otherwise use existing or new CRN
cos_instance_crn = var.enable_registry_storage == true ? (var.use_existing_cos != false ? var.existing_cos_id : module.cos_instance[0].cos_instance_id) : null

Expand Down Expand Up @@ -109,11 +108,10 @@ module "cos_instance" {
count = var.enable_registry_storage && !var.use_existing_cos ? 1 : 0

source = "terraform-ibm-modules/cos/ibm"
version = "10.5.1"
version = "10.5.8"
cos_instance_name = local.cos_name
resource_group_id = var.resource_group_id
cos_plan = local.cos_plan
cos_location = local.cos_location
kms_encryption_enabled = false
create_cos_bucket = false
}
Expand Down Expand Up @@ -706,7 +704,7 @@ locals {
module "cbr_rule" {
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
version = "1.33.7"
version = "1.33.8"
rule_description = var.cbr_rules[count.index].description
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
rule_contexts = var.cbr_rules[count.index].rule_contexts
Expand Down Expand Up @@ -739,7 +737,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.2.0"
version = "1.3.0"
crn = var.existing_secrets_manager_instance_crn
}

Expand Down
14 changes: 7 additions & 7 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0"
version = "1.3.0"
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.2.0"
version = "1.3.0"
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.2.0"
version = "1.3.0"
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.4.5"
version = "5.4.10"
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.2.0"
version = "1.3.0"
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.2.0"
version = "1.3.0"
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.15"
version = "1.3.17"
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.84.3"
version = "1.85.0"
}
helm = {
source = "hashicorp/helm"
version = "3.0.2"
version = "3.1.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion solutions/quickstart/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ locals {

module "vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.7.0"
version = "8.8.4"
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
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.84.3"
version = "1.85.0"
}
}
}
4 changes: 2 additions & 2 deletions tests/existing-resources/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module "resource_group" {

module "vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.7.0"
version = "8.8.4"
resource_group_id = module.resource_group.resource_group_id
region = var.region
name = "vpc"
Expand Down Expand Up @@ -54,7 +54,7 @@ module "vpc" {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.5.1"
version = "10.5.8"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand Down
10 changes: 5 additions & 5 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ module github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc

go 1.24.0

toolchain go1.25.3
toolchain go1.25.4

require (
github.com/IBM/go-sdk-core v1.1.0
github.com/gruntwork-io/terratest v0.51.0
github.com/gruntwork-io/terratest v0.52.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.21
)

require (
Expand All @@ -17,7 +17,7 @@ require (
github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
github.com/IBM/platform-services-go-sdk v0.89.0 // indirect
github.com/IBM/platform-services-go-sdk v0.90.0 // indirect
github.com/IBM/project-go-sdk v0.3.9 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand Down Expand Up @@ -96,7 +96,7 @@ require (
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/mod v0.28.0 // indirect
golang.org/x/net v0.45.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/tools v0.37.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ github.com/IBM/go-sdk-core v1.1.0/go.mod h1:2pcx9YWsIsZ3I7kH+1amiAkXvLTZtAq9kbxs
github.com/IBM/go-sdk-core/v5 v5.9.2/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
github.com/IBM/platform-services-go-sdk v0.89.0 h1:fIvKR1bQchPoMUXQf69gaRKak/giVAkRDISiAX8TlE8=
github.com/IBM/platform-services-go-sdk v0.89.0/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
github.com/IBM/platform-services-go-sdk v0.90.0 h1:hsUkgZZBGYK+szFb0tF9Q7uy1VjMY+VlYAPgPwFPMrg=
github.com/IBM/platform-services-go-sdk v0.90.0/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
github.com/IBM/project-go-sdk v0.3.9 h1:D/UfMMn+vMQyvYf9EfocV6HrD3HcVpeIVoUSjNKuROo=
github.com/IBM/project-go-sdk v0.3.9/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
github.com/IBM/schematics-go-sdk v0.4.0 h1:x01f/tPquYJYLQzJLGuxWfCbV/EdSMXRikOceNy/JLM=
Expand Down Expand Up @@ -155,8 +155,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gruntwork-io/terratest v0.51.0 h1:RCXlCwWlHqhUoxgF6n3hvywvbvrsTXqoqt34BrnLekw=
github.com/gruntwork-io/terratest v0.51.0/go.mod h1:evZHXb8VWDgv5O5zEEwfkwMhkx9I53QR/RB11cISrpg=
github.com/gruntwork-io/terratest v0.52.0 h1:7+I3FqEImowIajZ9Qyo5ngr7n2AUINJko6x+KzlWNjU=
github.com/gruntwork-io/terratest v0.52.0/go.mod h1:y2Evi+Ac04QpzF3mbRPqrBjipDN7gjqlw6+OZoy2vX4=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -303,8 +303,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17 h1:unGRxvM9OJBTsfDQg/AZCYOeJZ5TqrCsPphjWJ2wI94=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.17/go.mod h1:g0kmBhFk6pVoTmse42tMNCSNktiOYJHAda/pAzOIxco=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.21 h1:u+m413fTNcv8pM8q3xZUZCnNPh6/Ax9TtGEPC9XCswU=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.21/go.mod h1:uBNM9I6XCkIJXhWPwPIyKWOWTxWMJvR34XPoCpbcpos=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=
Expand Down Expand Up @@ -406,8 +406,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down