Skip to content

Commit 52a5262

Browse files
mounika-nallamounika-nalla
authored
feat: update required ibm provider version to >= 1.55.0, < 2.0.0 in order to pick up fix for [provider bug](IBM-Cloud/terraform-provider-ibm#4658) + update to consume COS module 6.6.0 from hashicorp instead of github (#169)
1 parent 9e5d127 commit 52a5262

File tree

16 files changed

+127
-70
lines changed

16 files changed

+127
-70
lines changed

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ A module for provisioning an IBM Cloud Red Hat OpenShift cluster on VPC Gen2. Th
2525
module "ocp_base" {
2626
# update this value to the value of your IBM Cloud API key
2727
ibmcloud_api_key = "ibm cloud api key" # pragma: allowlist secret
28-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc.git?ref=master"
28+
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
29+
version = "latest" # Replace "latest" with a release version to lock into a specific release
2930
cluster_name = "example-cluster-name"
3031
# modify the value for resource_group_id with and id of a group you own
3132
resource_group_id = "id of existing resource group"
@@ -136,7 +137,7 @@ Optionally, you need the following permissions to attach Access Management tags
136137
| Name | Version |
137138
|------|---------|
138139
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
139-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.51.0 |
140+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.55.0, < 2.0.0 |
140141
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.16.1 |
141142
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
142143
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1 |
@@ -145,7 +146,7 @@ Optionally, you need the following permissions to attach Access Management tags
145146

146147
| Name | Source | Version |
147148
|------|--------|---------|
148-
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | git::https://github.com/terraform-ibm-modules/terraform-ibm-cos.git | v6.1.0 |
149+
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 6.6.0 |
149150

150151
## Resources
151152

‎examples/add_rules_to_sg/main.tf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
##############################################################################
44

55
module "resource_group" {
6-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-resource-group.git?ref=v1.0.5"
6+
source = "terraform-ibm-modules/resource-group/ibm"
7+
version = "1.0.5"
78
# if an existing resource group is not set (null) create a new one using prefix
89
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
910
existing_resource_group_name = var.resource_group
@@ -14,7 +15,8 @@ module "resource_group" {
1415
###############################################################################
1516

1617
module "vpc" {
17-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc.git?ref=v5.0.1"
18+
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
19+
version = "7.2.0"
1820
resource_group_id = module.resource_group.resource_group_id
1921
region = var.region
2022
prefix = var.prefix
@@ -109,7 +111,8 @@ resource "ibm_is_security_group_rule" "kube_cluster_rules" {
109111
##############################################################################
110112

111113
module "kp_all_inclusive" {
112-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-key-protect-all-inclusive.git?ref=v4.0.0"
114+
source = "terraform-ibm-modules/key-protect-all-inclusive/ibm"
115+
version = "4.2.0"
113116
key_protect_instance_name = "${var.prefix}-kp-instance"
114117
resource_group_id = module.resource_group.resource_group_id
115118
region = var.region

‎examples/add_rules_to_sg/version.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
terraform {
22
required_version = ">=1.3.0"
33
required_providers {
4-
# Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
54
ibm = {
65
source = "ibm-cloud/ibm"
7-
version = "1.51.0"
6+
version = ">= 1.55.0"
87
}
98
}
109
}

‎examples/apply_taints/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
module "ocp_base" {
1313
# update this value to the value of your IBM Cloud API key
1414
ibmcloud_api_key = "ibm cloud api key" # pragma: allowlist secret
15-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc.git?ref=master"
15+
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
16+
version = "latest" # Replace "latest" with a release version to lock into a specific release
1617
cluster_name = "example-cluster-name"
1718
# modify the value for resource_group_id with and id of a group you own
1819
resource_group_id = "id of existing resource group"

‎examples/apply_taints/main.tf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
##############################################################################
44

55
module "resource_group" {
6-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-resource-group.git?ref=v1.0.5"
6+
source = "terraform-ibm-modules/resource-group/ibm"
7+
version = "1.0.5"
78
# if an existing resource group is not set (null) create a new one using prefix
89
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
910
existing_resource_group_name = var.resource_group
@@ -14,7 +15,8 @@ module "resource_group" {
1415
###############################################################################
1516

1617
module "vpc" {
17-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc.git?ref=v5.0.1"
18+
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
19+
version = "7.2.0"
1820
resource_group_id = module.resource_group.resource_group_id
1921
region = var.region
2022
prefix = var.prefix
@@ -30,7 +32,8 @@ module "vpc" {
3032
##############################################################################
3133

3234
module "kp_all_inclusive" {
33-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-key-protect-all-inclusive.git?ref=v4.0.0"
35+
source = "terraform-ibm-modules/key-protect-all-inclusive/ibm"
36+
version = "4.2.0"
3437
key_protect_instance_name = "${var.prefix}-kp-instance"
3538
resource_group_id = module.resource_group.resource_group_id
3639
region = var.region

‎examples/apply_taints/version.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
terraform {
22
required_version = ">=1.3.0"
33
required_providers {
4-
# Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
54
ibm = {
65
source = "ibm-cloud/ibm"
7-
version = "1.51.0"
6+
version = ">= 1.55.0"
87
}
98
}
109
}

‎examples/existing_cos/version.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
# Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
55
ibm = {
66
source = "ibm-cloud/ibm"
7-
version = "1.51.0"
7+
version = ">= 1.55.0"
88
}
99
}
1010
}

‎examples/multiple_mzr_clusters/main.tf‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
###############################################################################
44

55
module "resource_group" {
6-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-resource-group.git?ref=v1.0.5"
6+
source = "terraform-ibm-modules/resource-group/ibm"
7+
version = "1.0.5"
78
# if an existing resource group is not set (null) create a new one using prefix
89
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
910
existing_resource_group_name = var.resource_group
@@ -14,7 +15,8 @@ module "resource_group" {
1415
###############################################################################
1516

1617
module "vpc" {
17-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc.git?ref=v5.0.1"
18+
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
19+
version = "7.2.0"
1820
resource_group_id = module.resource_group.resource_group_id
1921
region = var.region
2022
prefix = var.prefix
@@ -102,7 +104,8 @@ data "ibm_container_cluster_config" "cluster_config_c2" {
102104
##############################################################################
103105

104106
module "observability_instances" {
105-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-observability-instances?ref=v2.5.0"
107+
source = "terraform-ibm-modules/observability-instances/ibm"
108+
version = "2.7.0"
106109
providers = {
107110
logdna.at = logdna.at
108111
logdna.ld = logdna.ld
@@ -123,7 +126,8 @@ module "observability_instances" {
123126
##############################################################################
124127

125128
module "observability_agents_1" {
126-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-observability-agents.git?ref=v1.1.0"
129+
source = "terraform-ibm-modules/observability-agents/ibm"
130+
version = "1.4.0"
127131
providers = {
128132
helm = helm.helm_cluster_1
129133
}
@@ -136,7 +140,8 @@ module "observability_agents_1" {
136140
}
137141

138142
module "observability_agents_2" {
139-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-observability-agents.git?ref=v1.1.0"
143+
source = "terraform-ibm-modules/observability-agents/ibm"
144+
version = "1.4.0"
140145
providers = {
141146
helm = helm.helm_cluster_2
142147
}

‎examples/multiple_mzr_clusters/version.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
terraform {
22
required_version = ">= 1.3.0"
33
required_providers {
4-
# Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
54
ibm = {
65
source = "ibm-cloud/ibm"
7-
version = "1.51.0"
6+
version = ">= 1.55.0"
87
}
98
# The kubernetes provider is not actually required by the module itself, just this example, so OK to use ">=" here instead of locking into a version
109
kubernetes = {

‎examples/single_zone_autoscale_cluster/main.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
###############################################################################
44

55
module "resource_group" {
6-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-resource-group.git?ref=v1.0.5"
6+
source = "terraform-ibm-modules/resource-group/ibm"
7+
version = "1.0.5"
78
# if an existing resource group is not set (i.e. null) create a new one using prefix
89
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
910
existing_resource_group_name = var.resource_group
@@ -14,7 +15,8 @@ module "resource_group" {
1415
###############################################################################
1516

1617
module "vpc" {
17-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc.git?ref=v5.0.1"
18+
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
19+
version = "7.2.0"
1820
resource_group_id = module.resource_group.resource_group_id
1921
region = var.region
2022
prefix = var.prefix

0 commit comments

Comments
 (0)