Skip to content

RHIDP-18822: rhdh: demote the OCP 4.20 Hive pool to on-demand - #89102

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
zdrapela:rhidp-18822-ocp-4-20-pool-zero
Nov 19, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
zdrapela:rhidp-18822-ocp-4-20-pool-zero

Conversation

@zdrapela

@zdrapela zdrapela commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Part 2 of RHIDP-18822, split out of #88842 so the 4.20 capacity and the 4.22 switch can be reviewed and merged separately.

OCP 4.22 becomes the RHDH default platform in #88842, so rhdh-4-20-us-east-2 no longer needs warm capacity. It only serves the three weekly version-matrix jobs, on different days, so size: 0 / maxSize: 3 is enough and clusters are built on demand.

Jira: https://redhat.atlassian.net/browse/RHIDP-18822

Why a separate PR

Demoting this pool while the default claims still point at 4.20 would push every required e2e-ocp-helm presubmit onto a cold pool of maxSize: 3, so it must land after #88842, not before. Keeping it separate means the merge order is explicit and the 4.22 switch can be reverted without also giving 4.20 its warm capacity back.

Testing

  • git diff --check clean; one file, no generated content.
  • Argo CD syncs hive-pools-rhdh automatically; existing 4.20 clusters are removed as they drain, and on-demand builds stay available up to maxSize: 3.

Assisted-by: OpenCode

Summary by CodeRabbit

This change reduces the OCP 4.20 Hive cluster pool for RHDH from a warm pool to an on-demand pool. The pool is rhdh-4-20-us-east-2, defined in clusters/hosted-mgmt/hive-pools-rhdh/rhdh-ocp-4-20-0-amd64-aws-us-east-2_clusterpool.yaml.

Changes in the ClusterPool spec:

  • maxSize changes from 25 to 3. The pool can hold at most three clusters.
  • size changes from 6 to 0. The pool keeps no pre-provisioned clusters. Clusters are created only when claimed.
  • runningCount: 3 is removed. The pool no longer keeps a fixed number of running clusters.

The AWS platform, credentials reference, region (us-east-2), pull secret reference, and owner label are unchanged.

Operational effect:

  • Argo CD syncs the hive-pools-rhdh path automatically. The change takes effect after sync.
  • Existing 4.20 clusters in the pool drain over time.
  • Jobs that need 4.20 still get clusters, but each claim waits for a new build, up to three concurrent clusters.
  • The author states that this PR must merge after the companion PR that makes OCP 4.22 the RHDH default. Otherwise, required e2e-ocp-helm presubmits could wait on a cold pool while default claims still target 4.20. The diff does not show this ordering. It comes from the PR description.

Review effort: low. One file changed, with 2 lines added and 3 lines removed.

OCP 4.22 becomes the RHDH default platform in the companion PR, so
rhdh-4-20-us-east-2 no longer needs warm capacity. The 4.20 pool keeps only
the three weekly version-matrix jobs, on different days, so size 0 /
maxSize 3 is enough and clusters are built on demand.

Merge this after the 4.22 pool and the claim switch: demoting 4.20 while the
default jobs still claim it would push every required presubmit onto a cold
pool of maxSize 3.

Assisted-by: OpenCode
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 18, 2026
@openshift-ci-robot

openshift-ci-robot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

@zdrapela: This pull request references RHIDP-18822 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.1.0" version, but no target version was set.

Details

In response to this:

Part 2 of RHIDP-18822, split out of #88842 so the 4.20 capacity and the 4.22 switch can be reviewed and merged separately.

OCP 4.22 becomes the RHDH default platform in #88842, so rhdh-4-20-us-east-2 no longer needs warm capacity. It only serves the three weekly version-matrix jobs, on different days, so size: 0 / maxSize: 3 is enough and clusters are built on demand.

Jira: https://redhat.atlassian.net/browse/RHIDP-18822

Why a separate PR

Demoting this pool while the default claims still point at 4.20 would push every required e2e-ocp-helm presubmit onto a cold pool of maxSize: 3, so it must land after #88842, not before. Keeping it separate means the merge order is explicit and the 4.22 switch can be reverted without also giving 4.20 its warm capacity back.

Testing

  • git diff --check clean; one file, no generated content.
  • Argo CD syncs hive-pools-rhdh automatically; existing 4.20 clusters are removed as they drain, and on-demand builds stay available up to maxSize: 3.

Assisted-by: OpenCode

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review.

Walkthrough

The ClusterPool configuration sets maxSize to 3 and size to 0. It removes the runningCount setting. AWS platform and pull-secret settings remain unchanged.

Changes

ClusterPool capacity

Layer / File(s) Summary
Update ClusterPool capacity settings
clusters/hosted-mgmt/hive-pools-rhdh/rhdh-ocp-4-20-0-amd64-aws-us-east-2_clusterpool.yaml
maxSize changes from 25 to 3, size changes from 6 to 0, and runningCount: 3 is removed.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Change: Other

Suggested reviewers: deepsm007

Merge Risk: Low · up to 1e0fc

This change moves the 4.20 pool to on-demand with at most three clusters. Merge it only after the companion PR #88842 lands, or required presubmits may wait on cold cluster provisioning. The change is easy to revert.

Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

Failed Failed checks: 10 inconclusive

Check name Status Explanation Resolution
Stable And Deterministic Test Names Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Test Structure And Quality Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Microshift Test Compatibility Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Single Node Openshift (Sno) Test Compatibility Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Topology-Aware Scheduling Compatibility Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Ote Binary Stdout Contract Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Ipv6 And Disconnected Network Test Compatibility Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
No-Weak-Crypto Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Container-Privileges Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
No-Sensitive-Data-In-Logs Inconclusive Pull request inputs changed after this check was assessed; its verdict is no longer current. Re-run the check against the current pull request inputs.
Passed Passed checks: 4 passed

Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title names the Jira key and the main change: demoting the OCP 4.20 Hive pool to on-demand. The raw summary confirms the ClusterPool change from size 6 to 0 and maxSize 25 to 3, which matches that…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title names the Jira key and the main change: demoting the OCP 4.20 Hive pool to on-demand. The raw summary confirms the ClusterPool change from size 6 to 0 and maxSize 25 to 3, which matches that change. The title is specific and descriptive, so it passes.

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: openshift/release
  • Branch: main
  • File: .coderabbit.yaml
  • Commit: f77a28b
  • Layers: Repository YAML (base), Central YAML (inherited)
  • Review profile: CHILL
  • Plan: Enterprise
  • Run ID: 9fed8bab-bc87-4ad2-a780-bed4d6df1f40
Commits

Reviewing files that changed from the base of the PR and between f77a28b and 1e0fc16.

Files selected for processing: 1

  • clusters/hosted-mgmt/hive-pools-rhdh/rhdh-ocp-4-20-0-amd64-aws-us-east-2_clusterpool.yaml

Included review availability: This review used your included allowance. Your plan provides up to 12 included reviews per hour; 10 remain after this review.

@openshift-ci
openshift-ci Bot requested review from gustavolira and psrna November 18, 2026 17:56
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 18, 2026
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Nov 18, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@zdrapela: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

@subhashkhileri

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2026
@openshift-ci

openshift-ci Bot commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: subhashkhileri, zdrapela

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci

openshift-ci Bot commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

@zdrapela: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 304bfd4 into openshift:main Nov 19, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants