Skip to content
Open
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ 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.7.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.7.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.7.0 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.32.6 |
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 8.21.25 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.1 |
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.2.11 |
| <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 |

### Resources
Expand Down
8 changes: 4 additions & 4 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.1.16"
version = "5.1.22"
key_protect_instance_name = "${var.prefix}-kp-instance"
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down Expand Up @@ -211,7 +211,7 @@ locals {

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.6.4"
version = "1.6.20"
resource_group_id = module.resource_group.resource_group_id
region = var.region
plan = "standard"
Expand All @@ -220,7 +220,7 @@ module "cloud_logs" {

module "trusted_profile" {
source = "terraform-ibm-modules/trusted-profile/ibm"
version = "2.3.1"
version = "3.1.1"
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 All @@ -245,7 +245,7 @@ module "trusted_profile" {
module "logs_agents" {
depends_on = [module.kube_audit]
source = "terraform-ibm-modules/logs-agent/ibm"
version = "1.2.2"
version = "1.4.1"
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 = "8.21.25"
version = "10.2.11"
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 = "8.21.25"
version = "10.2.11"

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 = "7.25.13"
version = "8.0.0"
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.32.6"
version = "1.33.1"
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.32.6"
version = "1.33.1"
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.32.6"
version = "1.33.1"
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.6.0"
version = "1.6.6"
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.6.3"
version = "1.7.2"
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.6.3"
version = "1.7.2"
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
18 changes: 9 additions & 9 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"crn:v1:bluemix:public:iam::::role:Viewer"
],
"service_name": "Resource group only",
"notes":"Viewer access is required in the resource group you want to provision in."
"notes": "Viewer access is required in the resource group you want to provision in."
},
{
"role_crns": [
Expand Down Expand Up @@ -1084,19 +1084,19 @@
"notes": "Required for creating Virtual Private Cloud (VPC)."
},
{
"service_name": "cloud-object-storage",
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"notes": "Required for creating the OpenShift cluster's internal registry storage bucket."
"service_name": "cloud-object-storage",
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"notes": "Required for creating the OpenShift cluster's internal registry storage bucket."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Viewer"
],
"service_name": "Resource group only",
"notes":"Viewer access is required in the resource group you want to provision in."
"notes": "Viewer access is required in the resource group you want to provision in."
}
],
"architecture": {
Expand Down Expand Up @@ -1246,7 +1246,7 @@
},
{
"key": "access_tags",
"hidden":true,
"hidden": true,
"custom_config": {
"type": "array",
"grouping": "deployment",
Expand Down
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ module "cos_instance" {
count = var.enable_registry_storage && !var.use_existing_cos ? 1 : 0

source = "terraform-ibm-modules/cos/ibm"
version = "8.21.25"
version = "10.2.11"
cos_instance_name = local.cos_name
resource_group_id = var.resource_group_id
cos_plan = local.cos_plan
Expand Down Expand Up @@ -688,7 +688,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.32.6"
version = "1.33.1"
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
4 changes: 2 additions & 2 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
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.1.16"
version = "5.1.22"
create_key_protect_instance = false
region = local.cluster_kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
Expand Down Expand Up @@ -277,7 +277,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.12"
version = "1.3.14"
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.81.0"
version = "1.82.0"
}
helm = {
source = "hashicorp/helm"
version = "2.17.0"
version = "3.0.2"
}
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 = "7.25.10"
version = "8.0.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
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.80.3"
version = "1.82.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 = "7.25.13"
version = "8.0.0"
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 = "8.21.25"
version = "10.2.11"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand Down
26 changes: 13 additions & 13 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ module github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc

go 1.24.0

toolchain go1.24.5
toolchain go1.25.0

require (
github.com/gruntwork-io/terratest v0.50.0
github.com/stretchr/testify v1.10.0
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.58.5
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.1
)

require (
Expand All @@ -16,7 +16,7 @@ require (
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
github.com/IBM/platform-services-go-sdk v0.85.1 // indirect
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
github.com/IBM/project-go-sdk v0.3.6 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand All @@ -38,7 +38,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.1 // indirect
github.com/go-openapi/errors v0.22.2 // 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 All @@ -61,7 +61,7 @@ require (
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
github.com/hashicorp/terraform-json v0.25.0 // indirect
github.com/hashicorp/terraform-json v0.26.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jinzhu/copier v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -84,19 +84,19 @@ require (
github.com/tmccombs/hcl2json v0.6.4 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.16.2 // indirect
github.com/zclconf/go-cty v1.16.3 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/crypto v0.40.0 // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/tools v0.34.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/tools v0.35.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading