Skip to content

fix: validation for new default ocp versions #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocofaigh merged 6 commits into from
Nov 26, 2025
Merged

fix: validation for new default ocp versions #870

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47b8dc7
fix: validation for new ocp_version
aamadeuss Nov 17, 2025
ec7ccc9
Merge branch 'main' into 16658_workerpools_validation
aamadeuss Nov 17, 2025
cef5f92
Merge branch 'main' into 16658_workerpools_validation
aamadeuss Nov 19, 2025
e619a6b
fix: version check fix
aamadeuss Nov 20, 2025
f6a882f
fix: suggestions for 4.20 and above
aamadeuss Nov 24, 2025
6b127ef
Update common-dev-assets
aamadeuss Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ locals {

default_ocp_version = "${data.ibm_container_cluster_versions.cluster_versions.default_openshift_version}_openshift"
ocp_version = var.ocp_version == null || var.ocp_version == "default" ? local.default_ocp_version : "${var.ocp_version}_openshift"
valid_versions_list = data.ibm_container_cluster_versions.cluster_versions.valid_openshift_versions
valid_ocp_versions = [for version in local.valid_versions_list : regex("^([0-9]+\\.[0-9]+)", version)[0]]

cos_name = var.use_existing_cos == true || (var.use_existing_cos == false && var.cos_name != null) ? var.cos_name : "${var.cluster_name}_cos"
cos_plan = "standard"
Expand Down
6 changes: 3 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ variable "worker_pools" {
}

validation {
condition = alltrue([
condition = (contains(local.valid_ocp_versions, local.ocp_version_num)) && alltrue([
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)) ||
(local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
(local.ocp_version_num == "4.19" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system))
(contains(["4.18", "4.19", "4.20"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
(tonumber(local.ocp_version_num) >= 4.21 && wp.operating_system == local.os_rhcos)
])
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)"
}
Expand Down