diff --git a/README.md b/README.md index 7cd4f0d28..79755b837 100644 --- a/README.md +++ b/README.md @@ -291,7 +291,7 @@ Optionally, you need the following permissions to attach Access Management tags |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | | [ibm](#requirement\_ibm) | >= 1.78.2, < 2.0.0 | -| [kubernetes](#requirement\_kubernetes) | >= 2.16.1, < 3.0.0 | +| [kubernetes](#requirement\_kubernetes) | >= 3.0.0, < 4.0.0 | | [null](#requirement\_null) | >= 3.2.1, < 4.0.0 | | [time](#requirement\_time) | >= 0.9.1, < 1.0.0 | @@ -299,13 +299,13 @@ Optionally, you need the following permissions to attach Access Management tags | Name | Source | Version | |------|--------|---------| -| [attach\_sg\_to\_api\_vpe](#module\_attach\_sg\_to\_api\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 | -| [attach\_sg\_to\_lb](#module\_attach\_sg\_to\_lb) | terraform-ibm-modules/security-group/ibm | 2.8.0 | -| [attach\_sg\_to\_master\_vpe](#module\_attach\_sg\_to\_master\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 | -| [attach\_sg\_to\_registry\_vpe](#module\_attach\_sg\_to\_registry\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.0 | +| [attach\_sg\_to\_api\_vpe](#module\_attach\_sg\_to\_api\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.5 | +| [attach\_sg\_to\_lb](#module\_attach\_sg\_to\_lb) | terraform-ibm-modules/security-group/ibm | 2.8.5 | +| [attach\_sg\_to\_master\_vpe](#module\_attach\_sg\_to\_master\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.5 | +| [attach\_sg\_to\_registry\_vpe](#module\_attach\_sg\_to\_registry\_vpe) | terraform-ibm-modules/security-group/ibm | 2.8.5 | | [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.34.0 | | [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.7.0 | -| [existing\_secrets\_manager\_instance\_parser](#module\_existing\_secrets\_manager\_instance\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.0 | +| [existing\_secrets\_manager\_instance\_parser](#module\_existing\_secrets\_manager\_instance\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.3 | | [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a | ### Resources diff --git a/common-dev-assets b/common-dev-assets index 238892ddd..99dc77722 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 238892dddce116998ab6b6ebdb998708401174d1 +Subproject commit 99dc77722bfa0a104d19511fd097af2fe0356db2 diff --git a/examples/add_rules_to_sg/main.tf b/examples/add_rules_to_sg/main.tf index 7380bc178..e5bab39e9 100644 --- a/examples/add_rules_to_sg/main.tf +++ b/examples/add_rules_to_sg/main.tf @@ -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 diff --git a/examples/advanced/main.tf b/examples/advanced/main.tf index 4580fb125..ee1408ae6 100644 --- a/examples/advanced/main.tf +++ b/examples/advanced/main.tf @@ -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 @@ -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 @@ -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. diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 4854b1fff..09238f729 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -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 diff --git a/examples/cross_kms_support/main.tf b/examples/cross_kms_support/main.tf index b680ed3e4..751798a5a 100644 --- a/examples/cross_kms_support/main.tf +++ b/examples/cross_kms_support/main.tf @@ -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 diff --git a/examples/custom_sg/main.tf b/examples/custom_sg/main.tf index 65e6e62e5..6fdcb4cf5 100644 --- a/examples/custom_sg/main.tf +++ b/examples/custom_sg/main.tf @@ -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 @@ -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 = [] diff --git a/examples/fscloud/main.tf b/examples/fscloud/main.tf index 60ab8786d..a4aedc537 100644 --- a/examples/fscloud/main.tf +++ b/examples/fscloud/main.tf @@ -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 @@ -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 @@ -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 = [] diff --git a/examples/multiple_mzr_clusters/main.tf b/examples/multiple_mzr_clusters/main.tf index e5d7899d8..ebc18dbaf 100644 --- a/examples/multiple_mzr_clusters/main.tf +++ b/examples/multiple_mzr_clusters/main.tf @@ -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 @@ -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 @@ -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 diff --git a/main.tf b/main.tf index 7d8ee7a7d..d87bd3037 100644 --- a/main.tf +++ b/main.tf @@ -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 @@ -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] @@ -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] @@ -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] @@ -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 } diff --git a/modules/fscloud/README.md b/modules/fscloud/README.md index 5a61899ca..9a51d2ca9 100644 --- a/modules/fscloud/README.md +++ b/modules/fscloud/README.md @@ -94,7 +94,7 @@ module "ocp_base_fscloud" { |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | | [ibm](#requirement\_ibm) | >= 1.78.2, < 2.0.0 | -| [kubernetes](#requirement\_kubernetes) | >= 2.16.1, < 3.0.0 | +| [kubernetes](#requirement\_kubernetes) | >= 3.0.0, < 4.0.0 | | [null](#requirement\_null) | >= 3.2.1, < 4.0.0 | | [time](#requirement\_time) | >= 0.9.1, < 1.0.0 | diff --git a/modules/fscloud/version.tf b/modules/fscloud/version.tf index da9b2a612..650efb057 100644 --- a/modules/fscloud/version.tf +++ b/modules/fscloud/version.tf @@ -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" } } } diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 1562a897a..9ddde0594 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -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 } @@ -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 } @@ -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 @@ -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 } @@ -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 } @@ -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 diff --git a/solutions/fully-configurable/version.tf b/solutions/fully-configurable/version.tf index 19f726712..1d508be07 100644 --- a/solutions/fully-configurable/version.tf +++ b/solutions/fully-configurable/version.tf @@ -5,7 +5,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.85.0" + version = "1.86.0" } helm = { source = "hashicorp/helm" @@ -13,7 +13,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = "2.38.0" + version = "3.0.0" } } } diff --git a/solutions/quickstart/main.tf b/solutions/quickstart/main.tf index 32b62a470..d966b02da 100644 --- a/solutions/quickstart/main.tf +++ b/solutions/quickstart/main.tf @@ -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 } @@ -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" diff --git a/solutions/quickstart/version.tf b/solutions/quickstart/version.tf index 1ebe3f94d..04443f767 100644 --- a/solutions/quickstart/version.tf +++ b/solutions/quickstart/version.tf @@ -5,7 +5,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.85.0" + version = "1.86.0" } } } diff --git a/tests/existing-resources/main.tf b/tests/existing-resources/main.tf index d08fb88ab..a9d11d647 100644 --- a/tests/existing-resources/main.tf +++ b/tests/existing-resources/main.tf @@ -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 } @@ -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" diff --git a/tests/go.mod b/tests/go.mod index 4022d61bf..0e594bca2 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -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 ( @@ -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 diff --git a/tests/go.sum b/tests/go.sum index 15db54fa0..8998277eb 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -83,8 +83,8 @@ github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC0 github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= -github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM= -github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk= +github.com/go-openapi/errors v0.22.5 h1:Yfv4O/PRYpNF3BNmVkEizcHb3uLVVsrDt3LNdgAKRY4= +github.com/go-openapi/errors v0.22.5/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk= github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic= github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk= github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= @@ -297,8 +297,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.34 h1:eED28nDc2If2KjsEi5VBAUt0at+FxVJw/lUcwzeW8Ck= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.34/go.mod h1:VCaRJKjjwIqWMdXqMwvC/9WCwWe8lBTRZrkYrQbcNUU= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.4 h1:Y0IvIJDQi1Fyr9bki3kLovqDl9DZWIFrtA7cuwT/rJ0= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.4/go.mod h1:clGPU4e57ofDSgBbNSzjNMf4KlJxSbVbU0O3FLpqRns= 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= diff --git a/version.tf b/version.tf index fac8de8b8..b44843af4 100644 --- a/version.tf +++ b/version.tf @@ -12,7 +12,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = ">= 2.16.1, < 3.0.0" + version = ">= 3.0.0, < 4.0.0" } time = { source = "hashicorp/time"