Skip to content

Commit 3a6851a

Browse files
vkuma17vkuma17
authored
fix(deps): update dependencies (#962)
1 parent 429f71d commit 3a6851a

File tree

9 files changed

+80
-32
lines changed

9 files changed

+80
-32
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Optionally, you need the following permissions to attach Access Management tags
178178
| <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.8.9 |
179179
| <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.8.9 |
180180
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.35.16 |
181-
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.14.2 |
181+
| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | terraform-ibm-modules/cos/ibm | 10.14.3 |
182182
| <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.4.2 |
183183
| <a name="module_worker_pools"></a> [worker\_pools](#module\_worker\_pools) | ./modules/worker-pool | n/a |
184184

‎examples/containerized_app_landing_zone/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ The primary goal of this example is to provision an OpenShift cluster on VPC and
4646
|------|--------|---------|
4747
| <a name="module_activity_tracker"></a> [activity\_tracker](#module\_activity\_tracker) | terraform-ibm-modules/activity-tracker/ibm | 1.6.13 |
4848
| <a name="module_app_config"></a> [app\_config](#module\_app\_config) | terraform-ibm-modules/app-configuration/ibm | 1.15.10 |
49-
| <a name="module_at_cos_bucket"></a> [at\_cos\_bucket](#module\_at\_cos\_bucket) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.2 |
49+
| <a name="module_at_cos_bucket"></a> [at\_cos\_bucket](#module\_at\_cos\_bucket) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.3 |
5050
| <a name="module_cloud_logs"></a> [cloud\_logs](#module\_cloud\_logs) | terraform-ibm-modules/cloud-logs/ibm | 1.12.2 |
51-
| <a name="module_cloud_logs_buckets"></a> [cloud\_logs\_buckets](#module\_cloud\_logs\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.2 |
51+
| <a name="module_cloud_logs_buckets"></a> [cloud\_logs\_buckets](#module\_cloud\_logs\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.3 |
5252
| <a name="module_cloud_monitoring"></a> [cloud\_monitoring](#module\_cloud\_monitoring) | terraform-ibm-modules/cloud-monitoring/ibm | 1.13.6 |
53-
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 10.14.2 |
54-
| <a name="module_en_cos_buckets"></a> [en\_cos\_buckets](#module\_en\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.2 |
53+
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 10.14.3 |
54+
| <a name="module_en_cos_buckets"></a> [en\_cos\_buckets](#module\_en\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.3 |
5555
| <a name="module_event_notifications"></a> [event\_notifications](#module\_event\_notifications) | terraform-ibm-modules/event-notifications/ibm | 2.11.19 |
5656
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.5.31 |
5757
| <a name="module_logs_agent"></a> [logs\_agent](#module\_logs\_agent) | terraform-ibm-modules/logs-agent/ibm | 1.18.4 |
@@ -64,7 +64,7 @@ The primary goal of this example is to provision an OpenShift cluster on VPC and
6464
| <a name="module_secrets_manager"></a> [secrets\_manager](#module\_secrets\_manager) | terraform-ibm-modules/secrets-manager/ibm | 2.13.6 |
6565
| <a name="module_trusted_profile"></a> [trusted\_profile](#module\_trusted\_profile) | terraform-ibm-modules/trusted-profile/ibm | 3.2.19 |
6666
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 8.15.3 |
67-
| <a name="module_vpc_cos_buckets"></a> [vpc\_cos\_buckets](#module\_vpc\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.2 |
67+
| <a name="module_vpc_cos_buckets"></a> [vpc\_cos\_buckets](#module\_vpc\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 10.14.3 |
6868
| <a name="module_vpe_gateway"></a> [vpe\_gateway](#module\_vpe\_gateway) | terraform-ibm-modules/vpe-gateway/ibm | 5.0.4 |
6969

7070
### Resources

‎examples/containerized_app_landing_zone/main.tf‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ locals {
4444
]
4545
}
4646
]
47+
cos_instance_name = "${var.prefix}-cos-instance"
4748
}
4849

4950

@@ -103,8 +104,7 @@ module "metrics_routing" {
103104
}
104105
]
105106

106-
metrics_router_routes = local.default_metrics_router_route
107-
metrics_router_settings = { primary_metadata_region = var.region }
107+
metrics_router_routes = local.default_metrics_router_route
108108
}
109109

110110
#########################################################################################################
@@ -165,7 +165,7 @@ locals {
165165

166166
module "en_cos_buckets" {
167167
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
168-
version = "10.14.2"
168+
version = "10.14.3"
169169
bucket_configs = local.en_cos_bucket_config
170170
}
171171

@@ -284,10 +284,10 @@ resource "ibm_en_subscription_email" "en_email_subscription" {
284284

285285
module "cos" {
286286
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
287-
version = "10.14.2"
287+
version = "10.14.3"
288288
resource_group_id = module.resource_group.resource_group_id
289289
create_cos_instance = true
290-
cos_instance_name = "${var.prefix}-cos-instance"
290+
cos_instance_name = local.cos_instance_name
291291
cos_plan = "standard" # Possible values are `standard` or `cos-one-rate-plan`.
292292
}
293293

@@ -348,7 +348,7 @@ module "cloud_logs" {
348348

349349
module "cloud_logs_buckets" {
350350
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
351-
version = "10.14.2"
351+
version = "10.14.3"
352352
bucket_configs = [
353353
{
354354
bucket_name = local.data_bucket_name
@@ -435,6 +435,7 @@ locals {
435435
}
436436

437437
module "activity_tracker" {
438+
438439
source = "terraform-ibm-modules/activity-tracker/ibm"
439440
version = "1.6.13"
440441
cos_targets = [
@@ -443,7 +444,7 @@ module "activity_tracker" {
443444
endpoint = module.at_cos_bucket.buckets[local.activity_tracker_cos_target_bucket_name].s3_endpoint_private
444445
instance_id = module.cos.cos_instance_crn
445446
target_region = var.region
446-
target_name = module.cos.cos_instance_name
447+
target_name = local.cos_instance_name
447448
skip_atracker_cos_iam_auth_policy = false
448449
service_to_service_enabled = true
449450
}
@@ -453,7 +454,7 @@ module "activity_tracker" {
453454
{
454455
instance_id = module.cloud_logs.crn
455456
target_region = var.region
456-
target_name = module.cos.cos_instance_name
457+
target_name = local.cos_instance_name
457458
}
458459
]
459460

@@ -463,7 +464,7 @@ module "activity_tracker" {
463464

464465
module "at_cos_bucket" {
465466
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
466-
version = "10.14.2"
467+
version = "10.14.3"
467468
bucket_configs = [
468469
for value in local.at_buckets_config :
469470
{
@@ -618,7 +619,7 @@ locals {
618619
# Create COS bucket using the defined bucket configuration
619620
module "vpc_cos_buckets" {
620621
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
621-
version = "10.14.2"
622+
version = "10.14.3"
622623
bucket_configs = local.flow_logs_bucket_config
623624
}
624625

‎examples/fscloud/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "resource_group" {
1616

1717
module "cos_fscloud" {
1818
source = "terraform-ibm-modules/cos/ibm"
19-
version = "10.14.2"
19+
version = "10.14.3"
2020
resource_group_id = module.resource_group.resource_group_id
2121
create_cos_bucket = false
2222
cos_instance_name = "${var.prefix}-cos"
@@ -30,7 +30,7 @@ module "cos_fscloud" {
3030

3131
module "flowlogs_bucket" {
3232
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
33-
version = "10.14.2"
33+
version = "10.14.3"
3434

3535
bucket_configs = [
3636
{

‎examples/multiple_mzr_clusters/main.tf‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,25 @@ locals {
9292

9393
worker_pools = [
9494
{
95-
subnet_prefix = "default"
96-
pool_name = "default" # ibm_container_vpc_cluster automatically names standard pool "standard" (See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2849)
97-
machine_type = "bx2.4x16"
98-
workers_per_zone = 2
99-
operating_system = local.os_rhcos
95+
subnet_prefix = "default"
96+
pool_name = "default" # ibm_container_vpc_cluster automatically names standard pool "standard" (See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2849)
97+
machine_type = "bx2.4x16"
98+
workers_per_zone = 2
99+
minSize = 2
100+
maxSize = 3
101+
enableAutoscaling = true
102+
operating_system = local.os_rhcos
100103
},
101104
{
102-
subnet_prefix = "default"
103-
pool_name = "logging-worker-pool"
104-
machine_type = "bx2.4x16"
105-
workers_per_zone = 2
106-
labels = { "dedicated" : "logging-worker-pool" }
107-
operating_system = local.os_rhel_9
105+
subnet_prefix = "default"
106+
pool_name = "logging-worker-pool"
107+
machine_type = "bx2.4x16"
108+
workers_per_zone = 2
109+
labels = { "dedicated" : "logging-worker-pool" }
110+
minSize = 2
111+
maxSize = 3
112+
enableAutoscaling = true
113+
operating_system = local.os_rhel_9
108114
}
109115
]
110116

@@ -120,7 +126,10 @@ locals {
120126
}
121127

122128
module "ocp_base_cluster_1" {
123-
source = "../.."
129+
source = "../.."
130+
providers = {
131+
kubernetes = kubernetes.kubernetes_cluster_1
132+
}
124133
cluster_name = "${var.prefix}-cluster-1"
125134
resource_group_id = module.resource_group.resource_group_id
126135
region = var.region
@@ -133,10 +142,18 @@ module "ocp_base_cluster_1" {
133142
ocp_version = var.ocp_version
134143
tags = var.resource_tags
135144
ocp_entitlement = var.ocp_entitlement
145+
addons = {
146+
cluster-autoscaler = {
147+
version = "1.2.4"
148+
}
149+
}
136150
}
137151

138152
module "ocp_base_cluster_2" {
139153
source = "../.."
154+
providers = {
155+
kubernetes = kubernetes.kubernetes_cluster_2
156+
}
140157
# remove the above line and uncomment the below 2 lines to consume the module from the registry
141158
# source = "terraform-ibm-modules/base-ocp-vpc/ibm"
142159
# version = "X.Y.Z" # Replace "X.Y.Z" with a release version to lock into a specific release
@@ -152,6 +169,11 @@ module "ocp_base_cluster_2" {
152169
ocp_version = var.ocp_version
153170
tags = var.resource_tags
154171
ocp_entitlement = var.ocp_entitlement
172+
addons = {
173+
cluster-autoscaler = {
174+
version = "1.2.4"
175+
}
176+
}
155177
}
156178

157179
########################################################################################################################
@@ -210,4 +232,5 @@ module "monitoring_agent_2" {
210232
cluster_resource_group_id = module.resource_group.resource_group_id
211233
access_key = module.monitoring_instance.access_key
212234
instance_region = var.region
235+
cluster_shield_deploy = false
213236
}

‎examples/multiple_mzr_clusters/provider.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,17 @@ provider "helm" {
2424
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate
2525
}
2626
}
27+
28+
provider "kubernetes" {
29+
alias = "kubernetes_cluster_1"
30+
host = data.ibm_container_cluster_config.cluster_config_c1.host
31+
token = data.ibm_container_cluster_config.cluster_config_c1.token
32+
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c1.ca_certificate
33+
}
34+
35+
provider "kubernetes" {
36+
alias = "kubernetes_cluster_2"
37+
host = data.ibm_container_cluster_config.cluster_config_c2.host
38+
token = data.ibm_container_cluster_config.cluster_config_c2.token
39+
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate
40+
}

‎examples/multiple_mzr_clusters/version.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ terraform {
88
source = "ibm-cloud/ibm"
99
version = ">= 1.80.0"
1010
}
11-
11+
kubernetes = {
12+
source = "hashicorp/kubernetes"
13+
version = ">= 2.16.1"
14+
}
1215
helm = {
1316
source = "hashicorp/helm"
1417
version = ">= 3.0.0, <4.0.0"

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ module "cos_instance" {
146146
count = var.enable_registry_storage && !var.use_existing_cos ? 1 : 0
147147

148148
source = "terraform-ibm-modules/cos/ibm"
149-
version = "10.14.2"
149+
version = "10.14.3"
150150
cos_instance_name = local.cos_name
151151
resource_group_id = var.resource_group_id
152152
cos_plan = local.cos_plan

‎tests/other_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ func TestRunAdvancedExample(t *testing.T) {
110110
options := setupOptions(t, "base-ocp-adv", advancedExampleDir, ocpVersion3)
111111
options.PostApplyHook = getClusterIngress
112112

113+
options.IgnoreUpdates = testhelper.Exemptions{List: []string{"module.logs_agents.helm_release.logs_agent"}}
114+
options.IgnoreDestroys = testhelper.Exemptions{List: []string{"module.logs_agents.terraform_data.install_required_binaries[0]"}}
113115
output, err := options.RunTestConsistency()
114116

115117
assert.Nil(t, err, "This should not have errored")
@@ -199,6 +201,11 @@ func TestOpenshiftLandingZoneExample(t *testing.T) {
199201
"metrics_routing[0].ibm_metrics_router_settings.metrics_router_settings[0]",
200202
},
201203
},
204+
IgnoreDestroys: testhelper.Exemptions{
205+
List: []string{
206+
"module.logs_agent.terraform_data.install_required_binaries[0]",
207+
},
208+
},
202209
})
203210
options.TerraformVars = []testschematic.TestSchematicTerraformVar{
204211
{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},

0 commit comments

Comments
 (0)