feat: Added support for OCP 4.19 and made it the default version (#1075)

terraform-ibm-modules-ops · web-flow · commit 9be5810c3810 · 2025-10-30T15:35:15.000Z
diff --git 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
@@ -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/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-10-28T04:05:31Z",
+  "generated_at": "2025-10-30T11:04:18Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
diff --git a/README.md b/README.md
@@ -845,17 +845,17 @@ module "cluster_pattern" {
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.6.1 |
-| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.59.2 |
+| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.14.0 |
+| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.69.0 |
 | <a name="module_dynamic_values"></a> [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a |
-| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.6.1 |
+| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.14.0 |
 | <a name="module_key_management"></a> [key\_management](#module\_key\_management) | ./kms | n/a |
 | <a name="module_placement_group_map"></a> [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a |
 | <a name="module_ssh_keys"></a> [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a |
 | <a name="module_teleport_config"></a> [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a |
-| <a name="module_update_cbr_vpc_zone"></a> [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.33.2 |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 8.3.0 |
-| <a name="module_vsi"></a> [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.6.1 |
+| <a name="module_update_cbr_vpc_zone"></a> [update\_cbr\_vpc\_zone](#module\_update\_cbr\_vpc\_zone) | terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module | 1.33.7 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 8.7.0 |
+| <a name="module_vsi"></a> [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.14.0 |
 
 ### Resources
 
diff --git a/bastion_host.tf b/bastion_host.tf
@@ -42,7 +42,7 @@ module "teleport_config" {
 
 module "bastion_host" {
   source                          = "terraform-ibm-modules/landing-zone-vsi/ibm"
-  version                         = "5.6.1"
+  version                         = "5.14.0"
   for_each                        = local.bastion_vsi_map
   resource_group_id               = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
   create_security_group           = each.value.security_group == null ? false : true
diff --git a/cbr.tf b/cbr.tf
@@ -3,7 +3,7 @@
 ##############################################################################
 module "update_cbr_vpc_zone" {
   source                = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
-  version               = "1.33.2"
+  version               = "1.33.7"
   count                 = var.existing_vpc_cbr_zone_id != null ? 1 : 0
   use_existing_cbr_zone = true
   existing_zone_id      = var.existing_vpc_cbr_zone_id
diff --git a/cluster.tf b/cluster.tf
@@ -244,7 +244,7 @@ module "cluster" {
     if cluster.kube_type == "openshift"
   }
   source             = "terraform-ibm-modules/base-ocp-vpc/ibm"
-  version            = "3.59.2"
+  version            = "3.69.0"
   resource_group_id  = local.resource_groups[each.value.resource_group]
   region             = var.region
   cluster_name       = each.value.cluster_name
@@ -296,7 +296,6 @@ module "cluster" {
   existing_cos_id                       = each.value.cos_instance_crn
   disable_public_endpoint               = coalesce(each.value.disable_public_endpoint, true) # disable if not set or null
   verify_worker_network_readiness       = each.value.verify_cluster_network_readiness
-  use_private_endpoint                  = each.value.use_ibm_cloud_private_api_endpoints
   addons                                = { for addon_name, addon_version in each.value.addons : addon_name => { version = addon_version } if addon_version != null }
   enable_ocp_console                    = each.value.enable_ocp_console
   manage_all_addons                     = each.value.manage_all_addons
diff --git a/dynamic_values/config_modules/list_to_map/list_to_map.tf b/dynamic_values/config_modules/list_to_map/list_to_map.tf
@@ -25,7 +25,7 @@ variable "lookup_field" {
 }
 
 variable "lookup_value_regex" {
-  description = "regular expression for reurned value"
+  description = "regular expression for returned value"
   type        = string
   default     = null
 }
diff --git a/examples/one-vpc-one-vsi/version.tf b/examples/one-vpc-one-vsi/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
   }
 }
diff --git a/examples/override-example/version.tf b/examples/override-example/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
   }
 }
diff --git a/f5_vsi.tf b/f5_vsi.tf
@@ -117,7 +117,7 @@ locals {
 
 module "f5_vsi" {
   source                        = "terraform-ibm-modules/landing-zone-vsi/ibm"
-  version                       = "5.6.1"
+  version                       = "5.14.0"
   for_each                      = local.f5_vsi_map
   resource_group_id             = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
   create_security_group         = each.value.security_group == null ? false : true
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -1143,7 +1143,7 @@
               "key": "kube_version",
               "type": "string",
               "required": true,
-              "default_value": "4.18_openshift",
+              "default_value": "4.19_openshift",
               "options": [
                 {
                   "displayname": "4.14_openshift",
@@ -1164,6 +1164,10 @@
                 {
                   "displayname": "4.18_openshift",
                   "value": "4.18_openshift"
+                },
+                {
+                  "displayname": "4.19_openshift",
+                  "value": "4.19_openshift"
                 }
               ],
               "custom_config": {}
@@ -1451,7 +1455,7 @@
               "key": "kube_version",
               "type": "string",
               "required": true,
-              "default_value": "4.18_openshift",
+              "default_value": "4.19_openshift",
               "options": [
                 {
                   "displayname": "4.14_openshift",
@@ -1472,6 +1476,10 @@
                 {
                   "displayname": "4.18_openshift",
                   "value": "4.18_openshift"
+                },
+                {
+                  "displayname": "4.19_openshift",
+                  "value": "4.19_openshift"
                 }
               ],
               "custom_config": {}
diff --git a/main.tf b/main.tf
@@ -33,7 +33,7 @@ locals {
 # Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker.
 module "vpc" {
   source                      = "terraform-ibm-modules/landing-zone-vpc/ibm"
-  version                     = "8.3.0"
+  version                     = "8.7.0"
   for_each                    = local.vpc_map
   name                        = each.value.prefix
   existing_vpc_id             = each.value.existing_vpc_id
diff --git a/patterns/mixed/config.tf b/patterns/mixed/config.tf
@@ -109,7 +109,6 @@ locals {
         cos_name                        = "cos"
         entitlement                     = var.entitlement
         secondary_storage               = var.secondary_storage
-        use_private_endpoint            = var.use_private_endpoint
         operating_system                = "RHCOS"
         verify_worker_network_readiness = var.verify_worker_network_readiness
         boot_volume_crk_name            = "${var.prefix}-roks-key"
diff --git a/patterns/mixed/variables.tf b/patterns/mixed/variables.tf
@@ -219,12 +219,6 @@ variable "verify_worker_network_readiness" {
   default     = true
 }
 
-variable "use_private_endpoint" {
-  type        = bool
-  description = "Set this to true to force all api calls to use the IBM Cloud private endpoints."
-  default     = true
-}
-
 ##############################################################################
 
 
diff --git a/patterns/mixed/versions.tf b/patterns/mixed/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/roks-quickstart/version.tf b/patterns/roks-quickstart/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
   }
 }
diff --git a/patterns/roks/module/versions.tf b/patterns/roks/module/versions.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.82.1"
+      version = ">= 1.84.3"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf
@@ -200,13 +200,14 @@ variable "kube_version" {
     condition = anytrue([
       var.kube_version == null,
       var.kube_version == "default",
+      var.kube_version == "4.19_openshift",
       var.kube_version == "4.18_openshift",
       var.kube_version == "4.17_openshift",
       var.kube_version == "4.16_openshift",
       var.kube_version == "4.15_openshift",
       var.kube_version == "4.14_openshift",
     ])
-    error_message = "The kube_version value can currently only be '4.18_openshift', '4.17_openshift', '4.16_openshift', '4.15_openshift' or '4.14_openshift'"
+    error_message = "The kube_version value can currently only be '4.19_openshift', '4.18_openshift', '4.17_openshift', '4.16_openshift', '4.15_openshift', or '4.14_openshift'"
   }
 }
 
diff --git a/patterns/roks/versions.tf b/patterns/roks/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vpc/module/version.tf b/patterns/vpc/module/version.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.82.1"
+      version = ">= 1.84.3"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vsi-extension/main.tf b/patterns/vsi-extension/main.tf
@@ -44,7 +44,7 @@ locals {
 
 module "vsi" {
   source                          = "terraform-ibm-modules/landing-zone-vsi/ibm"
-  version                         = "5.6.1"
+  version                         = "5.14.0"
   resource_group_id               = data.ibm_is_vpc.vpc_by_id.resource_group
   create_security_group           = true
   prefix                          = "${var.prefix}-vsi"
diff --git a/patterns/vsi-extension/version.tf b/patterns/vsi-extension/version.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vsi-quickstart/version.tf b/patterns/vsi-quickstart/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
   }
 }
diff --git a/patterns/vsi/module/versions.tf b/patterns/vsi/module/versions.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.82.1"
+      version = ">= 1.84.3"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/vsi/versions.tf b/patterns/vsi/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.82.1"
+      version = "1.84.3"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/tests/go.mod b/tests/go.mod
diff --git a/tests/go.sum b/tests/go.sum
diff --git a/virtual_servers.tf b/virtual_servers.tf

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"files": "go.sum\|^.secrets.baseline$",`
`4`	`4`	`"lines": null`
`5`	`5`	`},`
`6`		`- "generated_at": "2025-10-28T04:05:31Z",`
	`6`	`+ "generated_at": "2025-10-30T11:04:18Z",`
`7`	`7`	`"plugins_used": [`
`8`	`8`	`{`
`9`	`9`	`"name": "AWSKeyDetector"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ variable "lookup_field" {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`variable "lookup_value_regex" {`
`28`		`- description = "regular expression for reurned value"`
	`28`	`+ description = "regular expression for returned value"`
`29`	`29`	`type = string`
`30`	`30`	`default = null`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`ibm = {`
`5`	`5`	`source = "IBM-Cloud/ibm"`
`6`		`- version = "1.82.1"`
	`6`	`+ version = "1.84.3"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`}`