feat: added support for OCP 4.14, removed support for OCP 4.11 (#676)

terraform-ibm-modules · Jan 9, 2024 · 83d4c24 · 83d4c24
1 parent 05642b0
commit 83d4c24
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -1012,19 +1012,19 @@
               "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"
                 },
                 {
                   "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"