hypershift: fix upgrade-hypershift-operator jobs on release branches <= 4.22 - #81259
Merged
openshift-merge-bot[bot] merged 3 commits intoJul 1, 2026
Conversation
…toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com>
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: ⛔ Files ignored due to path filters (16)
📒 Files selected for processing (8)
🚧 Files skipped from review as they are similar to previous changes (8)
WalkthroughAdds a HyperShift install toggle for AWS scale-from-zero flags, and updates 4.19–4.22 release configs and upgrade jobs to use PR operator images with new latest aliases. ChangesHyperShift install and release wiring
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh`:
- Around line 59-64: The scale-from-zero flags are being added to EXTRA_ARGS
before the CLOUD_PROVIDER-specific handling, which causes non-AWS installs to
inherit AWS-only options. Move the ENABLE_SCALE_FROM_ZERO append logic into the
AWS branch of the hypershift install flow so only the AWS path in
hypershift-install-commands.sh adds --scale-from-zero-provider aws and the AWS
credentials flag, while keeping other providers unaffected.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: a99a1cf3-158d-440d-b0e8-8eece6b25d71
📒 Files selected for processing (8)
ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yamlci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yamlci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yamlci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yamlci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yamlci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yamlci-operator/step-registry/hypershift/install/hypershift-install-commands.shci-operator/step-registry/hypershift/install/hypershift-install-ref.yaml
Contributor
Author
|
/pj-rehearse pull-ci-openshift-hypershift-e2e-aws |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com>
devguyio
force-pushed
the
fix-hypershift-install-scale-from-zero
branch
from
June 30, 2026 11:24
e21339b to
7780114
Compare
Contributor
|
@devguyio: job(s): pull-ci-openshift-hypershift-e2e-aws either don't exist or were not found to be affected, and cannot be rehearsed |
Contributor
Author
|
/pj-rehearse pull-ci-openshift-hypershift-main-e2e-aws |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Contributor
Author
|
/pj-rehearse pull-ci-openshift-hypershift-release-4.21-e2e-aws-upgrade-hypershift-operator |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Contributor
|
/approve |
Contributor
Author
|
/rehearse-ack This PR made the upgrade job pass the failure point as intended. However, a machine deployment rollout did happen but it's not clear what's the reason, however this is irrelevant of this PR and should be further debugged on a real release-4.21 PR if it fails there. |
Member
|
/approve |
openshift-ci
Bot
added
the
approved
1 task
Contributor
Author
|
/pj-rehearse ack |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
openshift-merge-bot
Bot
added
the
rehearsals-ack
devguyio
changed the title
openshift-merge-bot
Bot
removed
the
rehearsals-ack
devguyio
force-pushed
the
fix-hypershift-install-scale-from-zero
branch
from
June 30, 2026 21:54
53bde44 to
c19dd8e
Compare
Contributor
Author
|
I added the last piece to make the upgrade-hypershift-operator jobs work as intended:
|
The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com>
devguyio
force-pushed
the
fix-hypershift-install-scale-from-zero
branch
from
June 30, 2026 22:06
c19dd8e to
9f46e21
Compare
Contributor
|
[REHEARSALNOTIFIER]
A total of 773 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
Contributor
Author
|
/pj-rehearse pull-ci-openshift-hypershift-release-4.21-e2e-aws-upgrade-hypershift-operator |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: csrwng, devguyio, enxebre, muraee The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
Author
|
/pj-rehearse ack |
Contributor
|
@devguyio: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
openshift-merge-bot
Bot
added
the
rehearsals-ack
2 tasks
krisnababu
pushed a commit
to oharan2/release
that referenced
this pull request
Jul 3, 2026
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
andrej1991
pushed a commit
to andrej1991/release
that referenced
this pull request
Jul 6, 2026
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
smulje
pushed a commit
to smulje/release
that referenced
this pull request
Jul 9, 2026
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
SachinNinganure
pushed a commit
to SachinNinganure/release
that referenced
this pull request
Jul 20, 2026
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
3 tasks
amogh-redhat
pushed a commit
to amogh-redhat/release
that referenced
this pull request
Aug 5, 2026
![openshift-prow[bot]](https://github.githubassets.com/images/gravatars/gravatar-user-420.png){kind=avatar}
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
TimurMP
pushed a commit
to TimurMP/release
that referenced
this pull request
Sep 5, 2026
…<= 4.22 (openshift#81259) * hypershift: gate scale-from-zero flags behind ENABLE_SCALE_FROM_ZERO toggle PR openshift#72805 added --scale-from-zero-provider and --scale-from-zero-creds unconditionally to the hypershift install step. This broke upgrade-hypershift-operator jobs on pre-4.22 branches because those release-tagged operator images lack the flags. Move the flags behind an ENABLE_SCALE_FROM_ZERO env var (default true) and set it to false for the upgrade-hypershift-operator test in 4.19, 4.20, and 4.21 configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: move scale-from-zero flags inside AWS case block Address review feedback: keep AWS-specific --scale-from-zero-provider and --scale-from-zero-creds inside the AWS case block rather than in EXTRA_ARGS, which leaks into Azure/GCP/other install paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> * hypershift: upgrade test should upgrade to the PR-built operator image The upgrade-hypershift-operator test on release branches <= 4.22 was upgrading to hypershift-operator:latest (main) instead of the version-tagged image built from the PR. Override CI_HYPERSHIFT_OPERATOR to point to the PR-built hypershift-operator-4XX image. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> --------- Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
--scale-from-zero-*and--additional-operator-env-varsflags unconditionally. These don't exist in older HyperShift CLI versions, breakinge2e-aws-upgrade-hypershift-operatoron release branches that install from version-tagged operator images.hypershift install --helpoutput once after CLI resolution, then greps before passing flags that aren't universally available. No env var toggles or config overrides needed.CI_HYPERSHIFT_OPERATORon 4.19–4.22 so the upgrade test upgrades to the PR-built image instead ofhypershift-operator:latest(main).hypershift-operator-init→hypershift-operator-4XX-latest,hypershift-operator-4XX→hypershift-operator-pr.Flag compatibility (from audit of
cmd/install/install.goper branch)--additional-operator-env-vars--scale-from-zero-*Test plan
e2e-aws-upgrade-hypershift-operatoron 4.19/4.20 — both flags should be auto-skipped--additional-operator-env-varspasses,--scale-from-zero-*skipped🤖 Generated with Claude Code