Skip to content

Commit f6a882f

Browse files
committed
fix: suggestions for 4.20 and above
1 parent e619a6b commit f6a882f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

variables.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,8 @@ variable "worker_pools" {
107107
(local.ocp_version_num == "4.14" && wp.operating_system == local.os_rhel) ||
108108
(local.ocp_version_num == "4.15" && contains([local.os_rhel, local.os_rhcos], wp.operating_system)) ||
109109
(contains(["4.16", "4.17"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhel, local.os_rhcos], wp.operating_system)) ||
110-
(local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
111-
(local.ocp_version_num == "4.19" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
112-
(tonumber(local.ocp_version_num) > 4.19)
110+
(contains(["4.18", "4.19", "4.20"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
111+
(tonumber(local.ocp_version_num) >= 4.21 && wp.operating_system == local.os_rhcos)
113112
])
114113
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); v4.19: (RHEL_9_64, RHCOS)"
115114
}

0 commit comments

Comments
 (0)