fix: remove old params and fix hooks

Author: Jordan-Williams2

cluster.tf

@@ -83,14 +83,15 @@ resource "ibm_container_vpc_cluster" "cluster" {
     lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null
     ? local.default_kube_version[each.value.kube_type] : each.value.kube_version
   )
-  tags                                = var.tags
-  wait_till                           = var.wait_till
-  entitlement                         = each.value.entitlement
-  secondary_storage                   = each.value.secondary_storage
-  cos_instance_crn                    = each.value.cos_instance_crn
-  pod_subnet                          = each.value.pod_subnet
-  service_subnet                      = each.value.service_subnet
-  disable_outbound_traffic_protection = each.value.disable_outbound_traffic_protection
+  tags              = var.tags
+  wait_till         = var.wait_till
+  entitlement       = each.value.entitlement
+  secondary_storage = each.value.secondary_storage
+  cos_instance_crn  = each.value.cos_instance_crn
+  pod_subnet        = each.value.pod_subnet
+  service_subnet    = each.value.service_subnet
+  # if kube_version is older than 4.15, default this value to null, otherwise provider will fail
+  disable_outbound_traffic_protection = startswith((lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null ? local.default_kube_version[each.value.kube_type] : each.value.kube_version), "4.14") ? null : each.value.disable_outbound_traffic_protection
   force_delete_storage                = each.value.cluster_force_delete_storage
   operating_system                    = each.value.operating_system
   crk                                 = each.value.boot_volume_crk_name == null ? null : regex("key:(.*)", module.key_management.key_map[each.value.boot_volume_crk_name].crn)[0]
@@ -295,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
-  cluster_config_endpoint_type          = each.value.use_ibm_cloud_private_api_endpoints ? "private" : "default"
   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

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.15_openshift",
@@ -1451,7 +1451,7 @@
               "key": "kube_version",
               "type": "string",
               "required": true,
-              "default_value": "4.18_openshift",
+              "default_value": "4.19_openshift",
               "options": [
                 {
                   "displayname": "4.15_openshift",

patterns/roks/module/variables.tf

@@ -274,7 +274,7 @@ variable "operating_system" {
   description = "The operating system of the workers in the default worker pool. If no value is specified, the current default version OS will be used. See https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions#openshift_versions_available ."
   default     = "RHCOS"
   validation {
-    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards."
+    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
     condition     = var.operating_system == "REDHAT_8_64" || var.operating_system == "RHEL_9_64" || var.operating_system == "RHCOS"
   }
 }

patterns/roks/variables.tf

@@ -205,8 +205,9 @@ variable "kube_version" {
       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.19_openshift', '4.18_openshift', '4.17_openshift', '4.16_openshift', or '4.15_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'"
   }
 }
 
@@ -293,7 +294,7 @@ variable "operating_system" {
   description = "The operating system of the workers in the default worker pool. If no value is specified, the current default version OS will be used. See https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions#openshift_versions_available ."
   default     = "RHCOS"
   validation {
-    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards."
+    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
     condition     = var.operating_system == "REDHAT_8_64" || var.operating_system == "RHEL_9_64" || var.operating_system == "RHCOS"
   }
 }

variables.tf

@@ -1015,7 +1015,7 @@ variable "clusters" {
 
   # operating_system validation
   validation {
-    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards."
+    error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (RHEL_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
     condition     = length([for cluster in var.clusters : true if cluster.operating_system == null || cluster.operating_system == "REDHAT_8_64" || cluster.operating_system == "RHEL_9_64" || cluster.operating_system == "RHCOS"]) == length(var.clusters)
   }