Skip to content

Conversation

@arya-girish-k
Copy link
Contributor

Description

Added Openshift-ai addon

Release required?

  • No release
  • Patch release (x.x.X)
  • Minor release (x.X.x)
  • Major release (X.x.x)
Release notes content

Run the pipeline

If the CI pipeline doesn't run when you create the PR, the PR requires a user with GitHub collaborators access to run the pipeline.

Run the CI pipeline when the PR is ready for review and you expect tests to pass. Add a comment to the PR with the following text:

/run pipeline

Checklist for reviewers

  • If relevant, a test for the change is included or updated with this PR.
  • If relevant, documentation for the change is included or updated with this PR.

For mergers

  • Use a conventional commit message to set the release level. Follow the guidelines.
  • Include information that users need to know about the PR in the commit message. The commit message becomes part of the GitHub release notes.
  • Use the Squash and merge option.

@arya-girish-k
Copy link
Contributor Author

/run pipeline

Copy link
Member

@imprateeksh imprateeksh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check the comments.

ignore_worker_pool_size_changes = true
addons = {
"cluster-autoscaler" = "1.2.3"
"openshift-ai" = "416"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not make changes in existing examples unless required.

#tflint-ignore: terraform_unused_declarations
resource "null_resource" "validations" {
provisioner "local-exec" {
#command = "scripts/validations.sh ${local.ocp_version} ${local.worker_pool[0].worker_count} ${local.worker_pool[0].flavor} '${join(" ", [for addon in data.ibm_container_addons.addons.addons : addon.name])}' ${local.worker_pool[0].operating_system} ${var.pool_name}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the unwanted code.


addons {
name = "openshift-ai"
version = "416"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not hardcode the version instead use a variable for ocp ai addon version.

kubeconfig = "../../kubeconfig"
}
#tflint-ignore: terraform_unused_declarations
resource "null_resource" "validations" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest to use a better name for resource something like validate_cluster or validate_cluster_specs

@@ -0,0 +1,14 @@
terraform {
required_version = ">= 1.3.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make use of version 1.9.0 and utilize the cross referencing feature when required.

}
variable "cluster_name" {
type = string
description = "The name that will be assigned to the provisioned cluster"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please correct the description - The name of the existing cluster.

}
variable "pool_name" {
type = string
description = "The name that will be assigned to the worker pool"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please improvise this description.

cluster-autoscaler = optional(string)
vpc-block-csi-driver = optional(string)
ibm-storage-operator = optional(string)
openshift-ai = optional(string)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can omit including openshift-ai here. We will use addon DA to include this.

ocp_version = data.ibm_container_cluster_versions.cluster_versions.default_openshift_version
kubeconfig = "../../kubeconfig"
}
#tflint-ignore: terraform_unused_declarations
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not remove this comment unless really required?

@@ -0,0 +1,49 @@
# Retrieve existing OpenShift cluster details
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this code, we do not have changes for new cluster scenario. Please add the resources for the use case where a new cluster is created.

@arya-girish-k arya-girish-k changed the title Added Openshift-ai addon [Do Not Merge]-Added Openshift-ai addon Mar 28, 2025
@imprateeksh
Copy link
Member

Closing this PR as it is no longer required. OCP AI related validations are already included in this module.

@imprateeksh imprateeksh deleted the 12533_issue branch May 28, 2025 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants