diff --git a/ibm_catalog.json b/ibm_catalog.json index c99323c30..5ea2f0f9e 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1012,12 +1012,8 @@ "key": "kube_version", "type": "string", "required": true, - "default_value": "4.13_openshift", + "default_value": "4.14_openshift", "options": [ - { - "displayname": "4.11_openshift", - "value": "4.11_openshift" - }, { "displayname": "4.12_openshift", "value": "4.12_openshift" @@ -1025,6 +1021,10 @@ { "displayname": "4.13_openshift", "value": "4.13_openshift" + }, + { + "displayname": "4.14_openshift", + "value": "4.14_openshift" } ], "custom_config": { diff --git a/patterns/mixed/versions.tf b/patterns/mixed/versions.tf index f829e525a..0babd9c99 100644 --- a/patterns/mixed/versions.tf +++ b/patterns/mixed/versions.tf @@ -4,7 +4,7 @@ terraform { required_version = ">= 1.3, < 1.6" - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { source = "IBM-Cloud/ibm" diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf index bf983a012..0059eac7d 100644 --- a/patterns/roks/variables.tf +++ b/patterns/roks/variables.tf @@ -127,14 +127,14 @@ variable "cluster_zones" { variable "kube_version" { description = "The version of the OpenShift cluster that should be provisioned. Current supported values are '4.12_openshift' (default), '4.11_openshift', or '4.10_openshift'. NOTE: This is only used during initial cluster provisioning, but ignored for future updates. Cluster version updates should be done outside of terraform to prevent possible destructive changes." type = string - default = "4.13_openshift" + default = "4.14_openshift" validation { condition = anytrue([ + var.kube_version == "4.14_openshift", var.kube_version == "4.13_openshift", var.kube_version == "4.12_openshift", - var.kube_version == "4.11_openshift" ]) - error_message = "The kube_version value can currently only be '4.13_openshift', '4.12_openshift', or '4.11_openshift'" + error_message = "The kube_version value can currently only be '4.14_openshift', '4.13_openshift', or '4.12_openshift'" } } diff --git a/patterns/roks/versions.tf b/patterns/roks/versions.tf index 6c80f71fb..48b5e6e5b 100644 --- a/patterns/roks/versions.tf +++ b/patterns/roks/versions.tf @@ -4,7 +4,7 @@ terraform { required_version = ">= 1.3, < 1.6" - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { source = "IBM-Cloud/ibm" diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf index 6c80f71fb..48b5e6e5b 100644 --- a/patterns/vpc/version.tf +++ b/patterns/vpc/version.tf @@ -4,7 +4,7 @@ terraform { required_version = ">= 1.3, < 1.6" - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { source = "IBM-Cloud/ibm" diff --git a/patterns/vsi-extension/version.tf b/patterns/vsi-extension/version.tf index 6c80f71fb..48b5e6e5b 100644 --- a/patterns/vsi-extension/version.tf +++ b/patterns/vsi-extension/version.tf @@ -4,7 +4,7 @@ terraform { required_version = ">= 1.3, < 1.6" - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { source = "IBM-Cloud/ibm" diff --git a/patterns/vsi-quickstart/version.tf b/patterns/vsi-quickstart/version.tf index 04928c422..2e3d00ec3 100644 --- a/patterns/vsi-quickstart/version.tf +++ b/patterns/vsi-quickstart/version.tf @@ -1,7 +1,7 @@ terraform { required_version = ">= 1.3, < 1.6" required_providers { - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions ibm = { source = "IBM-Cloud/ibm" version = "1.61.0" diff --git a/patterns/vsi/versions.tf b/patterns/vsi/versions.tf index 6c80f71fb..48b5e6e5b 100644 --- a/patterns/vsi/versions.tf +++ b/patterns/vsi/versions.tf @@ -4,7 +4,7 @@ terraform { required_version = ">= 1.3, < 1.6" - # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works + # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { source = "IBM-Cloud/ibm"