Skip to content

fix: updated worker node validation for ocp-ai #724

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
merged 5 commits into from
Jul 14, 2025
Merged

fix: updated worker node validation for ocp-ai #724

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1cb8d7
fix: updated worker node validation for ocp-ai
imprateeksh Jul 11, 2025
1a6ca48
fix: added dependency
imprateeksh Jul 11, 2025
18dd8e0
Merge branch 'main' into 14452-node-count
imprateeksh Jul 12, 2025
4ad8eed
Merge branch 'main' into 14452-node-count
imprateeksh Jul 14, 2025
174371f
fix: removed validation as already validated by provider
imprateeksh Jul 14, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ Optionally, you need the following permissions to attach Access Management tags
| [ibm_container_addons.existing_addons](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/container_addons) | data source |
| [ibm_container_cluster_config.cluster_config](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/container_cluster_config) | data source |
| [ibm_container_cluster_versions.cluster_versions](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/container_cluster_versions) | data source |
| [ibm_container_vpc_cluster.cluster](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/container_vpc_cluster) | data source |
| [ibm_container_vpc_worker_pool.all_pools](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/container_vpc_worker_pool) | data source |
| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/iam_account_settings) | data source |
| [ibm_iam_auth_token.reset_api_key_tokendata](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/iam_auth_token) | data source |
Expand Down
13 changes: 6 additions & 7 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ locals {

# Local block to verify validations for OCP AI Addon.
locals {
# get the total workers per pool
workers_per_pool = {
for pool in var.worker_pools :
pool.pool_name => (
pool.vpc_subnets != null ? length(pool.vpc_subnets) * pool.workers_per_zone : length(var.vpc_subnets[pool.subnet_prefix]) * pool.workers_per_zone
)
}

# retrieve worker specs (CPU & RAM) for all worker pools
worker_specs = {
Expand Down Expand Up @@ -478,6 +471,12 @@ resource "null_resource" "confirm_network_healthy" {
}
}

# To get the workers information required for OCP AI validation
data "ibm_container_vpc_cluster" "cluster" {
depends_on = [ibm_container_vpc_cluster.cluster, ibm_container_vpc_cluster.autoscaling_cluster, ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool]
name = var.cluster_name
}

##############################################################################
# Enable or Disable OCP Console Patch
##############################################################################
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ variable "addons" {
}

validation {
condition = (lookup(var.addons, "openshift-ai", null) != null ? lookup(var.addons["openshift-ai"], "version", null) == null : true) || alltrue([for workers in values(local.workers_per_pool) : workers >= 2])
error_message = "OCP AI add-on requires at least 2 worker nodes in each worker pool."
condition = (lookup(var.addons, "openshift-ai", null) != null ? lookup(var.addons["openshift-ai"], "version", null) == null : true) || length(data.ibm_container_vpc_cluster.cluster.workers) >= 2
error_message = "OCP AI add-on requires at least 2 worker nodes in the cluster."
}

validation {
Expand Down