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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
call-terraform-ci-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.6
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.6
secrets: inherit
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ You need the following permissions to run this module.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_existing_boot_volume_kms_key_crn_parser"></a> [existing\_boot\_volume\_kms\_key\_crn\_parser](#module\_existing\_boot\_volume\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.4.3 |
| <a name="module_existing_boot_volume_kms_key_crn_parser"></a> [existing\_boot\_volume\_kms\_key\_crn\_parser](#module\_existing\_boot\_volume\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.5.0 |

### Resources

Expand Down Expand Up @@ -254,7 +254,7 @@ You need the following permissions to run this module.
| <a name="input_install_monitoring_agent"></a> [install\_monitoring\_agent](#input\_install\_monitoring\_agent) | Set to true to install the IBM Cloud Monitoring agent on the provisioned VSI to gather both metrics and security and compliance data. If set to true, values must be passed for `monitoring_access_key`, `monitoring_collector_endpoint` and `monitoring_collector_port`. Installation logs can be found on the VSI in /run/logging-agent/logs-agent-install.log | `bool` | `false` | no |
| <a name="input_kms_encryption_enabled"></a> [kms\_encryption\_enabled](#input\_kms\_encryption\_enabled) | Set this to true to control the encryption keys used to encrypt the data that for the block storage volumes for VPC. If set to false, the data is encrypted by using randomly generated keys. For more info on encrypting block storage volumes, see https://cloud.ibm.com/docs/vpc?topic=vpc-creating-instances-byok | `bool` | `false` | no |
| <a name="input_load_balancers"></a> [load\_balancers](#input\_load\_balancers) | Load balancers to add to VSI | <pre>list(<br/> object({<br/> name = string<br/> type = string<br/> listener_port = optional(number)<br/> listener_port_max = optional(number)<br/> listener_port_min = optional(number)<br/> listener_protocol = string<br/> connection_limit = optional(number)<br/> idle_connection_timeout = optional(number)<br/> algorithm = string<br/> protocol = string<br/> health_delay = number<br/> health_retries = number<br/> health_timeout = number<br/> health_type = string<br/> pool_member_port = string<br/> profile = optional(string)<br/> accept_proxy_protocol = optional(bool)<br/> subnet_id_to_provision_nlb = optional(string) # Required for Network Load Balancer. If no value is provided, the first one from the VPC subnet list will be selected.<br/> dns = optional(<br/> object({<br/> instance_crn = string<br/> zone_id = string<br/> })<br/> )<br/> security_group = optional(<br/> object({<br/> name = string<br/> rules = list(<br/> object({<br/> name = string<br/> direction = string<br/> source = string<br/> tcp = optional(<br/> object({<br/> port_max = number<br/> port_min = number<br/> })<br/> )<br/> udp = optional(<br/> object({<br/> port_max = number<br/> port_min = number<br/> })<br/> )<br/> icmp = optional(<br/> object({<br/> type = number<br/> code = number<br/> })<br/> )<br/> })<br/> )<br/> })<br/> )<br/> })<br/> )</pre> | `[]` | no |
| <a name="input_logging_agent_version"></a> [logging\_agent\_version](#input\_logging\_agent\_version) | Version of the logging agent to install. See https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-release-notes-agent for list of versions. Only applies if `install_logging_agent` is true. | `string` | `"1.8.0"` | no |
| <a name="input_logging_agent_version"></a> [logging\_agent\_version](#input\_logging\_agent\_version) | Version of the logging agent to install. See https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-release-notes-agent for list of versions. Only applies if `install_logging_agent` is true. | `string` | `"1.8.1"` | no |
| <a name="input_logging_api_key"></a> [logging\_api\_key](#input\_logging\_api\_key) | API key used by the logging agent to authenticate with IBM Cloud, must be provided if `logging_auth_mode` is set to `IAMAPIKey`. For more information on creating an API key for the logging agent, see https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-iam-ingestion-serviceid-api-key. | `string` | `null` | no |
| <a name="input_logging_application_name"></a> [logging\_application\_name](#input\_logging\_application\_name) | The application name defines the environment that produces and sends logs to IBM Cloud Logs. If not provided, the value defaults to `$HOSTNAME`. | `bool` | `null` | no |
| <a name="input_logging_auth_mode"></a> [logging\_auth\_mode](#input\_logging\_auth\_mode) | Authentication mode the logging agent to use to authenticate with IBM Cloud, must be either `IAMAPIKey` or `VSITrustedProfile`. | `string` | `"IAMAPIKey"` | no |
Expand Down
6 changes: 3 additions & 3 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -45,7 +45,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand All @@ -70,7 +70,7 @@ resource "ibm_is_placement_group" "placement_group" {

module "vsi_image_selector" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/vsi-image-selector"
version = "1.4.3"
version = "1.5.0"
architecture = "amd64"
operating_system = "ubuntu"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/catalog-image/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -45,7 +45,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down
10 changes: 5 additions & 5 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -24,7 +24,7 @@ module "resource_group" {

module "key_protect_all_inclusive" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.36"
version = "5.6.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
key_protect_instance_name = "${var.prefix}-kp"
Expand Down Expand Up @@ -67,7 +67,7 @@ module "logging" {
module "monitoring" {
source = "terraform-ibm-modules/cloud-monitoring/ibm"
plan = "graduated-tier"
version = "1.14.6"
version = "1.15.1"
resource_group_id = module.resource_group.resource_group_id
region = var.region
resource_tags = var.resource_tags
Expand Down Expand Up @@ -102,7 +102,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down Expand Up @@ -204,7 +204,7 @@ locals {

module "vsi_image_selector" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/vsi-image-selector"
version = "1.4.3"
version = "1.5.0"
architecture = "amd64"
operating_system = "ubuntu"
}
Expand Down
6 changes: 3 additions & 3 deletions examples/fscloud/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -44,7 +44,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand All @@ -58,7 +58,7 @@ module "slz_vpc" {

module "vsi_image_selector" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/vsi-image-selector"
version = "1.4.3"
version = "1.5.0"
architecture = "amd64"
operating_system = "ubuntu"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/gen2-storage/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -45,7 +45,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down
10 changes: 5 additions & 5 deletions examples/multi-profile-one-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -24,7 +24,7 @@ module "resource_group" {

module "key_protect_all_inclusive" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.36"
version = "5.6.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
key_protect_instance_name = "${var.prefix}-kp"
Expand All @@ -44,7 +44,7 @@ module "key_protect_all_inclusive" {

module "existing_boot_volume_kms_key_crn_parser" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.3"
version = "1.5.0"
crn = module.key_protect_all_inclusive.keys["slz-vsi.${var.prefix}-vsi"].crn
}

Expand Down Expand Up @@ -120,7 +120,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand Down Expand Up @@ -207,7 +207,7 @@ locals {

module "vsi_image_selector" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/vsi-image-selector"
version = "1.4.3"
version = "1.5.0"
architecture = "amd64"
operating_system = "ubuntu"
}
Expand Down
6 changes: 3 additions & 3 deletions examples/snapshot/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.5.0"
version = "1.6.0"
# 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 @@ -45,7 +45,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {

module "slz_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = var.region
prefix = var.prefix
Expand All @@ -59,7 +59,7 @@ module "slz_vpc" {

module "vsi_image_selector" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/vsi-image-selector"
version = "1.4.3"
version = "1.5.0"
architecture = "amd64"
operating_system = "ubuntu"
}
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ resource "ibm_is_virtual_network_interface" "secondary_vni" {
module "existing_boot_volume_kms_key_crn_parser" {
count = local.create_auth_policy ? 0 : 1
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.3"
version = "1.5.0"
crn = var.boot_volume_encryption_key
}

Expand Down
16 changes: 8 additions & 8 deletions solutions/fully-configurable/main.tf
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.5.0"
version = "1.6.0"
existing_resource_group_name = var.existing_resource_group_name
}

Expand All @@ -14,14 +14,14 @@ 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.4.3"
version = "1.5.0"
crn = var.existing_kms_instance_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.4.3"
version = "1.5.0"
crn = var.existing_boot_volume_kms_key_crn
}

Expand Down Expand Up @@ -96,7 +96,7 @@ module "kms" {
}
count = var.kms_encryption_enabled_boot_volume && var.existing_boot_volume_kms_key_crn == null ? 1 : 0
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.5.36"
version = "5.6.0"
create_key_protect_instance = false
region = local.kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
Expand Down Expand Up @@ -125,7 +125,7 @@ module "kms" {

module "existing_vpc_crn_parser" {
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.3"
version = "1.5.0"
crn = var.existing_vpc_crn
}

Expand Down Expand Up @@ -283,7 +283,7 @@ locals {
module "trusted_profile" {
count = local.create_logging_trusted_profile ? 1 : 0
source = "terraform-ibm-modules/trusted-profile/ibm"
version = "3.2.20"
version = "3.3.0"

trusted_profile_name = "${local.prefix}-vsi-logging-trusted-profile"
trusted_profile_description = "Trusted profile for VSI instances to send logs to IBM Cloud Logs instance - ${local.cloud_logs_instance_id}"
Expand Down Expand Up @@ -335,7 +335,7 @@ module "trusted_profile" {
module "existing_secret_manager_crn_parser" {
count = var.existing_secrets_manager_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.3"
version = "1.5.0"
crn = var.existing_secrets_manager_instance_crn
}
locals {
Expand All @@ -346,7 +346,7 @@ locals {
module "secrets_manager_arbitrary_secret" {
count = var.existing_secrets_manager_instance_crn != null && var.auto_generate_ssh_key ? 1 : 0
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
version = "2.13.9"
version = "2.14.0"
existing_sm_instance_guid = local.existing_secrets_manager_instance_guid
existing_sm_instance_region = local.existing_secrets_manager_instance_region
endpoint_type = var.existing_secrets_manager_endpoint_type
Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ variable "install_logging_agent" {

variable "logging_agent_version" {
type = string
default = "1.8.0" # datasource: icr.io/ibm-observe/logs-agent-helm
default = "1.8.1" # datasource: icr.io/ibm-observe/logs-agent-helm
description = "Version of the logging agent to install. See https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-release-notes-agent for list of versions. Only applies if `install_logging_agent` is true."
}

Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/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.89.0"
version = "2.0.0"
}
time = {
source = "hashicorp/time"
Expand Down
6 changes: 3 additions & 3 deletions solutions/quickstart/main.tf
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.5.0"
version = "1.6.0"
existing_resource_group_name = var.existing_resource_group_name
}

Expand Down Expand Up @@ -40,7 +40,7 @@ data "ibm_is_ssh_key" "existing_ssh_key" {
module "vpc" {
count = var.existing_vpc_crn != null ? 0 : 1
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "8.16.1"
version = "8.16.2"
resource_group_id = module.resource_group.resource_group_id
region = local.vpc_region
prefix = local.prefix != "" ? trimspace(var.prefix) : null
Expand Down Expand Up @@ -145,7 +145,7 @@ data "ibm_is_image" "image" {
module "existing_vpc_crn_parser" {
count = var.existing_vpc_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.4.3"
version = "1.5.0"
crn = var.existing_vpc_crn
}

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.89.0"
version = "2.0.0"
}
tls = {
source = "hashicorp/tls"
Expand Down
Loading