Skip to content

Add support for OCP 4.18 and make it the default #1026

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

Jump to bottom
Merged
merged 11 commits into from
Aug 13, 2025
Merged

Add support for OCP 4.18 and make it the default #1026

merged 11 commits into from
Aug 13, 2025

Conversation

@ocofaigh
Copy link
Contributor

@ocofaigh ocofaigh commented Aug 8, 2025 •
edited
Loading

Description

  • Added 4.18 support (needed to bump version of base OCP module)
  • Removed the ability to set "Default" as a value and instead added the default value to the DA input directly in ibm_catalog.json (so users always know exactly what version they are going to deploy)

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.

@ocofaigh
Copy link
Contributor Author

ocofaigh commented Aug 8, 2025

/run pipeline

@vkuma17 vkuma17 mentioned this pull request Aug 8, 2025
Closed
6 tasks
@toddgiguere
Copy link
Member

toddgiguere commented Aug 8, 2025

/run pipeline

@toddgiguere
Copy link
Member

toddgiguere commented Aug 8, 2025

/run pipeline

@toddgiguere
Copy link
Member

toddgiguere commented Aug 11, 2025

SKIP UPGRADE TEST explanation:

As expected, the TestRunUpgradeROKSQuickStartPattern and TestRunUpgradeRoksPattern are erroring on the input validation for the new default version of ROKS v4.18 conflicting with default worker pool OS "RHEL_8_64", which is unavoidable. Will need to skip upgrade tests.

Currently only the ROKS upgrade tests are failing.

@toddgiguere
Copy link
Member

toddgiguere commented Aug 11, 2025

The ROKS tests are reporting an issue with cluster addons, which I think is part of the fix in this PR to conform the addons input map to the new version of the base-ocp-vpc module input map.

We need further changes here, I'm investigating.

vkuma17
vkuma17 reviewed Aug 12, 2025
View reviewed changes
variables.tf Outdated
validation {
error_message = "RHEL 8 (REDHAT_8_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
condition = length([for cluster in var.clusters : true if cluster.operating_system == null || cluster.operating_system == "REDHAT_8_64" || cluster.operating_system == "RHCOS"]) == length(var.clusters)
error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (REDHAT_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
Copy link

@vkuma17 vkuma17 Aug 12, 2025

Choose a reason for hiding this comment

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

I think this should be RHEL_9_64 instead of REDHAT_9_64.

Copy link
Member

@toddgiguere toddgiguere Aug 12, 2025

Choose a reason for hiding this comment

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

correct, it was in 3 different files, I've done global search to fix them all.

vkuma17
vkuma17 reviewed Aug 12, 2025
View reviewed changes
variables.tf Outdated
error_message = "RHEL 8 (REDHAT_8_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
condition = length([for cluster in var.clusters : true if cluster.operating_system == null || cluster.operating_system == "REDHAT_8_64" || cluster.operating_system == "RHCOS"]) == length(var.clusters)
error_message = "RHEL 8 (REDHAT_8_64), RHEL 9 (REDHAT_9_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
condition = length([for cluster in var.clusters : true if cluster.operating_system == null || cluster.operating_system == "REDHAT_8_64" || cluster.operating_system == "REDHAT_9_64" || cluster.operating_system == "RHCOS"]) == length(var.clusters)
Copy link

@vkuma17 vkuma17 Aug 12, 2025

Choose a reason for hiding this comment

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

I think this should be RHEL_9_64 instead of REDHAT_9_64.

@vkuma17
Copy link

vkuma17 commented Aug 12, 2025

/run pipeline

@toddgiguere
fix: cluster addons refactor to not include null version
e756396
@toddgiguere
fix: os should be RHEL_9_64
e1f2604
@toddgiguere
chore: skipping upgrade tests
c2c1d5c 
new ocp default + old default os type will never pass for main branch, noted in pr and skipping upgrade.

SKIP UPGRADE TEST
@toddgiguere
Copy link
Member

toddgiguere commented Aug 12, 2025

/run pipeline

@toddgiguere
Copy link
Member

toddgiguere commented Aug 12, 2025

Latest test failure was probably a cloud platform issue, so I think we are getting close on this one.

summary: 'isWaitForLBAvailable failed: timeout while waiting for state to become ''done

@toddgiguere
Copy link
Member

toddgiguere commented Aug 12, 2025

/run pipeline

@ocofaigh ocofaigh merged commit 2a6c06e into main Aug 13, 2025
2 checks passed
@ocofaigh ocofaigh deleted the ocofaigh-patch-1 branch August 13, 2025 06:47
@terraform-ibm-modules-ops
Copy link
Contributor

terraform-ibm-modules-ops commented Aug 13, 2025

🎉 This PR is included in version 8.5.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vkuma17 vkuma17 vkuma17 left review comments

@Aashiq-J Aashiq-J Aashiq-J approved these changes

@toddgiguere toddgiguere Awaiting requested review from toddgiguere

Assignees

No one assigned

Labels

released

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ocofaigh @toddgiguere @vkuma17 @terraform-ibm-modules-ops @Aashiq-J