feat: allow OpenShift v4.18 cluster version (#715)

Author: vkuma17

ibm_catalog.json

@@ -193,6 +193,10 @@
               "key": "ocp_version",
               "required": true,
               "options": [
+                {
+                  "displayname": "4.18",
+                  "value": "4.18"
+                },
                 {
                   "displayname": "4.17",
                   "value": "4.17"

tests/pr_test.go

@@ -28,10 +28,10 @@ const customsgExampleDir = "examples/custom_sg"
 const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-resources.yaml"
 
 // Ensure there is one test per supported OCP version
-const ocpVersion1 = "4.17" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample
-const ocpVersion2 = "4.16" // used by TestCustomSGExample and TestRunCustomsgExample
-const ocpVersion3 = "4.15" // used by TestRunAdvancedExample and TestCrossKmsSupportExample
-const ocpVersion4 = "4.14" // used by TestRunAddRulesToSGExample and TestRunBasicExample
+const ocpVersion1 = "4.18" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample
+const ocpVersion2 = "4.17" // used by TestCustomSGExample and TestRunCustomsgExample
+const ocpVersion3 = "4.16" // used by TestRunAdvancedExample and TestCrossKmsSupportExample
+const ocpVersion4 = "4.15" // used by TestRunAddRulesToSGExample and TestRunBasicExample
 
 var (
 	sharedInfoSvc      *cloudinfo.CloudInfoService

variables.tf

@@ -112,9 +112,10 @@ variable "worker_pools" {
       for wp in var.worker_pools :
       (local.ocp_version_num == "4.14" && wp.operating_system == local.os_rhel) ||
       (local.ocp_version_num == "4.15" && contains([local.os_rhel, local.os_rhcos], wp.operating_system)) ||
-      (contains(["4.16", "4.17"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhel, local.os_rhcos], wp.operating_system))
+      (contains(["4.16", "4.17"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhel, local.os_rhcos], wp.operating_system)) ||
+      (local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system))
     ])
-    error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64)"
+    error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64); v4.18: (RHCOS, RHEL_9_64)"
   }
 
   validation {
@@ -200,6 +201,7 @@ variable "ocp_version" {
       var.ocp_version == "4.15",
       var.ocp_version == "4.16",
       var.ocp_version == "4.17",
+      var.ocp_version == "4.18",
     ])
     error_message = "The specified ocp_version is not of the valid versions."
   }