Skip to content

Commit e619a6b

Browse files
committed
fix: version check fix
1 parent cef5f92 commit e619a6b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ variable "worker_pools" {
102102
}
103103

104104
validation {
105-
condition = alltrue([
105+
condition = (contains(local.valid_ocp_versions, local.ocp_version_num)) && alltrue([
106106
for wp in var.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)) ||
110110
(local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
111111
(local.ocp_version_num == "4.19" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
112-
(contains(local.valid_ocp_versions, local.ocp_version_num))
112+
(tonumber(local.ocp_version_num) > 4.19)
113113
])
114114
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)"
115115
}

0 commit comments

Comments
 (0)