diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14502e48..54553835 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - created jobs: call-terraform-ci-pipeline: - uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.22.5 + uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2 secrets: inherit with: craSCCv2: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13edc440..a6421eb1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,5 +8,5 @@ on: jobs: call-terraform-release-pipeline: - uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.22.5 + uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2 secrets: inherit diff --git a/README.md b/README.md index 3a1c1785..b8f87626 100644 --- a/README.md +++ b/README.md @@ -246,12 +246,12 @@ 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.7.0 | -| [attach\_sg\_to\_lb](#module\_attach\_sg\_to\_lb) | terraform-ibm-modules/security-group/ibm | 2.7.0 | -| [attach\_sg\_to\_master\_vpe](#module\_attach\_sg\_to\_master\_vpe) | terraform-ibm-modules/security-group/ibm | 2.7.0 | -| [attach\_sg\_to\_registry\_vpe](#module\_attach\_sg\_to\_registry\_vpe) | terraform-ibm-modules/security-group/ibm | 2.7.0 | +| [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 | | [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.2 | -| [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.2.21 | +| [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.4.0 | | [existing\_secrets\_manager\_instance\_parser](#module\_existing\_secrets\_manager\_instance\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.2.0 | ### Resources diff --git a/common-dev-assets b/common-dev-assets index 84e744a2..95eee196 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 84e744a27f774dac276e9381db01b6fe378c0af3 +Subproject commit 95eee1969a5ad814bfa2e5a07b03c8ee6b589271 diff --git a/examples/advanced/main.tf b/examples/advanced/main.tf index bd63210e..80d0fdaf 100644 --- a/examples/advanced/main.tf +++ b/examples/advanced/main.tf @@ -22,7 +22,7 @@ locals { module "kp_all_inclusive" { source = "terraform-ibm-modules/kms-all-inclusive/ibm" - version = "5.2.0" + version = "5.3.0" key_protect_instance_name = "${var.prefix}-kp-instance" resource_group_id = module.resource_group.resource_group_id region = var.region @@ -211,7 +211,7 @@ locals { module "cloud_logs" { source = "terraform-ibm-modules/cloud-logs/ibm" - version = "1.6.29" + version = "1.7.1" resource_group_id = module.resource_group.resource_group_id region = var.region plan = "standard" @@ -247,7 +247,7 @@ module "trusted_profile" { module "logs_agents" { depends_on = [module.kube_audit] source = "terraform-ibm-modules/logs-agent/ibm" - version = "1.7.2" + version = "1.8.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 diff --git a/examples/custom_sg/main.tf b/examples/custom_sg/main.tf index eda29709..cf8ee125 100644 --- a/examples/custom_sg/main.tf +++ b/examples/custom_sg/main.tf @@ -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.7.0" + version = "2.8.0" 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 1b994e67..afb987cd 100644 --- a/examples/fscloud/main.tf +++ b/examples/fscloud/main.tf @@ -16,7 +16,7 @@ module "resource_group" { module "cos_fscloud" { source = "terraform-ibm-modules/cos/ibm" - version = "10.2.21" + version = "10.4.0" resource_group_id = module.resource_group.resource_group_id create_cos_bucket = false cos_instance_name = "${var.prefix}-cos" @@ -30,7 +30,7 @@ module "cos_fscloud" { module "flowlogs_bucket" { source = "terraform-ibm-modules/cos/ibm//modules/buckets" - version = "10.2.21" + version = "10.4.0" bucket_configs = [ { @@ -52,7 +52,7 @@ module "flowlogs_bucket" { module "vpc" { depends_on = [module.flowlogs_bucket] source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "8.3.0" + version = "8.5.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.7.0" + version = "2.8.0" 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 1954a6f8..96b84e50 100644 --- a/examples/multiple_mzr_clusters/main.tf +++ b/examples/multiple_mzr_clusters/main.tf @@ -173,7 +173,7 @@ data "ibm_container_cluster_config" "cluster_config_c2" { module "monitoring_instance" { source = "terraform-ibm-modules/cloud-monitoring/ibm" - version = "1.7.2" + version = "1.8.1" resource_group_id = module.resource_group.resource_group_id region = var.region plan = "graduated-tier" @@ -190,7 +190,7 @@ module "monitoring_agent_1" { helm = helm.helm_cluster_1 } source = "terraform-ibm-modules/monitoring-agent/ibm" - version = "1.8.4" + version = "1.9.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 @@ -202,7 +202,7 @@ module "monitoring_agent_2" { helm = helm.helm_cluster_2 } source = "terraform-ibm-modules/monitoring-agent/ibm" - version = "1.8.4" + version = "1.9.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 diff --git a/main.tf b/main.tf index 7dd35cf5..2b6c6f31 100644 --- a/main.tf +++ b/main.tf @@ -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 = "10.2.21" + version = "10.4.0" cos_instance_name = local.cos_name resource_group_id = var.resource_group_id cos_plan = local.cos_plan @@ -586,7 +586,7 @@ locals { module "attach_sg_to_lb" { count = length(var.additional_lb_security_group_ids) source = "terraform-ibm-modules/security-group/ibm" - version = "2.7.0" + version = "2.8.0" 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 @@ -637,7 +637,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.7.0" + version = "2.8.0" 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] @@ -646,7 +646,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.7.0" + version = "2.8.0" 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] @@ -655,7 +655,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.7.0" + version = "2.8.0" 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] diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 4dae249a..404ff4b6 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -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.2.0" + version = "5.3.0" create_key_protect_instance = false region = local.cluster_kms_region existing_kms_instance_crn = var.existing_kms_instance_crn diff --git a/solutions/fully-configurable/version.tf b/solutions/fully-configurable/version.tf index befc0a4a..920d3ac2 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.82.1" + version = "1.83.1" } helm = { source = "hashicorp/helm" diff --git a/solutions/quickstart/main.tf b/solutions/quickstart/main.tf index fcde41e5..f7bfbd95 100644 --- a/solutions/quickstart/main.tf +++ b/solutions/quickstart/main.tf @@ -67,7 +67,7 @@ locals { module "vpc" { source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "8.3.0" + version = "8.5.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 08749a54..004f650f 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.82.1" + version = "1.83.1" } } } diff --git a/tests/existing-resources/main.tf b/tests/existing-resources/main.tf index 5a81d623..179ad2a8 100644 --- a/tests/existing-resources/main.tf +++ b/tests/existing-resources/main.tf @@ -14,7 +14,7 @@ module "resource_group" { module "vpc" { source = "terraform-ibm-modules/landing-zone-vpc/ibm" - version = "8.3.0" + version = "8.5.0" resource_group_id = module.resource_group.resource_group_id region = var.region name = "vpc" @@ -54,7 +54,7 @@ module "vpc" { module "cos" { source = "terraform-ibm-modules/cos/ibm" - version = "10.2.21" + version = "10.4.0" resource_group_id = module.resource_group.resource_group_id region = var.region cos_instance_name = "${var.prefix}-cos" diff --git a/tests/go.mod b/tests/go.mod index e7846d4c..3b2ea590 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,9 +5,9 @@ go 1.24.0 toolchain go1.25.1 require ( - github.com/gruntwork-io/terratest v0.50.0 + github.com/gruntwork-io/terratest v0.51.0 github.com/stretchr/testify v1.11.1 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.10 ) require ( @@ -90,6 +90,7 @@ require ( 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 + go.yaml.in/yaml/v2 v2.4.2 // 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 @@ -100,5 +101,5 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/tests/go.sum b/tests/go.sum index 38ef9adc..811718ec 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -147,8 +147,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.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw= -github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4= +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/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= @@ -295,8 +295,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.9 h1:ntigNnXy4Ut6eVMfBUjQ5yoIZR5Rt419+pwfle4MO5c= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9/go.mod h1:YBrRYc+5y5Pr9CXmY35lOqTQdlIjA4x4+3iVObXGOCE= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.10 h1:dOH4lHp8/wtXDNJA2SGI2NOuMp/EDoWFw1uVWf5HJ88= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.10/go.mod h1:YBrRYc+5y5Pr9CXmY35lOqTQdlIjA4x4+3iVObXGOCE= 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= @@ -331,6 +331,8 @@ go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHy go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -500,8 +502,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -524,5 +526,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=