Skip to content

OCPBUGS-43449: Remove UltraSSD_LRS from DiskStorageAccountType for OS Disks#7727

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
hypershift-community:fix-OCPBUGS-43449-v2
Feb 20, 2026
Merged

OCPBUGS-43449: Remove UltraSSD_LRS from DiskStorageAccountType for OS Disks#7727
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
hypershift-community:fix-OCPBUGS-43449-v2

Conversation

@hypershift-jira-solve-ci
Copy link

@hypershift-jira-solve-ci hypershift-jira-solve-ci bot commented Feb 16, 2026

What this PR does / why we need it:

Removes UltraSSD_LRS from the AzureDiskStorageAccountType enum validation in the NodePool API. According to Azure documentation, Ultra Disks (UltraSSD_LRS) are not supported for OS Disks — they can only be used as data disks.

Changes:

  • Removed UltraSSD_LRS from the kubebuilder Enum validation on AzureDiskStorageAccountType
  • Removed the DiskStorageAccountTypesUltraSSDLRS constant
  • Removed the XValidation rule on AzureNodePoolOSDisk that referenced UltraSSD_LRS for conditional disk size constraints
  • Reduced max SizeGiB from 65,536 to 32,767 (the higher limit was only needed for UltraSSD_LRS)
  • Updated field documentation to note UltraSSD_LRS is not supported for OS disks
  • Regenerated CRDs and API docs

Which issue(s) this PR fixes:

Fixes OCPBUGS-43449

Special notes for your reviewer:

Azure Ultra Disks (UltraSSD_LRS) cannot be used as OS disks per Azure's own documentation. This change removes it from the API validation to prevent users from specifying an unsupported disk type. The valid values for OS disk storage account type are now: Premium_LRS, PremiumV2_LRS, Standard_LRS, StandardSSD_LRS.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code via /jira-solve OCPBUGS-43449 origin --ci

Always review AI generated responses prior to use.

Summary by CodeRabbit

Release Notes

  • Bug Fixes

    • Corrected Azure OS disk configuration by removing unsupported UltraSSD_LRS storage type option and reducing maximum disk size limit from 65536 GiB to 32767 GiB
  • Documentation

    • Updated reference documentation to clarify supported Azure disk storage types and OS disk size constraints

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 16, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 16, 2026
@openshift-ci-robot
Copy link

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot
Copy link

@hypershift-jira-solve-ci[bot]: This pull request references Jira Issue OCPBUGS-43449, which is invalid:

  • expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.18.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

What this PR does / why we need it:

Removes UltraSSD_LRS from the AzureDiskStorageAccountType enum validation in the NodePool API. According to Azure documentation, Ultra Disks (UltraSSD_LRS) are not supported for OS Disks — they can only be used as data disks.

Changes:

  • Removed UltraSSD_LRS from the kubebuilder Enum validation on AzureDiskStorageAccountType
  • Removed the DiskStorageAccountTypesUltraSSDLRS constant
  • Removed the XValidation rule on AzureNodePoolOSDisk that referenced UltraSSD_LRS for conditional disk size constraints
  • Reduced max SizeGiB from 65,536 to 32,767 (the higher limit was only needed for UltraSSD_LRS)
  • Updated field documentation to note UltraSSD_LRS is not supported for OS disks
  • Regenerated CRDs and API docs

Which issue(s) this PR fixes:

Fixes OCPBUGS-43449

Special notes for your reviewer:

Azure Ultra Disks (UltraSSD_LRS) cannot be used as OS disks per Azure's own documentation. This change removes it from the API validation to prevent users from specifying an unsupported disk type. The valid values for OS disk storage account type are now: Premium_LRS, PremiumV2_LRS, Standard_LRS, StandardSSD_LRS.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code via /jira-solve OCPBUGS-43449 origin --ci

Always review AI generated responses prior to use.

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
Copy link
Contributor

coderabbitai bot commented Feb 16, 2026

No actionable comments were generated in the recent review. 🎉


Walkthrough

Removed UltraSSD_LRS as an allowed Azure OS disk storage account type and lowered the OS disk maximum size constraint from 65536 to 32767 GiB across the API types, generated CRD manifests, and documentation; related cross-field validations referencing UltraSSD_LRS were removed.

Changes

Cohort / File(s) Summary
API Type Definition
api/hypershift/v1beta1/azure.go
Deleted DiskStorageAccountTypesUltraSSDLRS constant; updated AzureDiskStorageAccountType enum to exclude UltraSSD_LRS; changed AzureNodePoolOSDisk.sizeGiB max from 65536 → 32767 and updated related validation comments.
Generated CRD Manifests
api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml, api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml, cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-*.crd.yaml
Removed UltraSSD_LRS from osDisk.diskStorageAccountType enums; set osDisk.sizeGiB maximum to 32767; removed x-kubernetes-validations cross-field rule that enforced UltraSSD_LRS-dependent size constraints.
Documentation
docs/content/reference/aggregated-docs.md, docs/content/reference/api.md
Updated descriptions to state UltraSSD_LRS is not supported for OS disks; clarified sizeGiB valid range as 16–32767 and noted default behavior (current default 30 GiB); removed references implying UltraSSD_LRS OS-disk support.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and specifically describes the main change: removing UltraSSD_LRS from DiskStorageAccountType for OS Disks, which aligns with the changeset focused on removing this storage type from Azure OS disk configurations.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed This PR modifies only API definitions, generated CRD manifests, and documentation files. No test files (*_test.go) are introduced or modified.
Test Structure And Quality ✅ Passed No test files were modified in this PR; only API definitions, generated CRD manifests, and documentation files were changed.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Comment @coderabbitai help to get the list of available commands and usage tips.

@hypershift-jira-solve-ci
Copy link
Author

/auto-cc

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 16, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 16, 2026

Hi @hypershift-jira-solve-ci[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci openshift-ci bot added area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/documentation Indicates the PR includes changes for documentation area/platform/azure PR/issue for Azure (AzurePlatform) platform and removed do-not-merge/needs-area labels Feb 16, 2026
@openshift-ci openshift-ci bot requested review from devguyio and jparrill February 16, 2026 08:53
@enxebre
Copy link
Member

enxebre commented Feb 19, 2026

/lgtm

@enxebre enxebre marked this pull request as ready for review February 19, 2026 10:30
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 19, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2026
@openshift-ci-robot
Copy link

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@enxebre
Copy link
Member

enxebre commented Feb 19, 2026

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 19, 2026
@bryan-cox
Copy link
Member

hypershift-jira-solve-ci - verify is failing, you need to fix this

@openshift-ci-robot
Copy link

@bryan-cox: This pull request references Jira Issue OCPBUGS-43449, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 19, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, hypershift-jira-solve-ci[bot]

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2026
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2026
@hypershift-jira-solve-ci
Copy link
Author

@bryan-cox Done. Rebased on main and updated the GCPPlatform.yaml featuregated CRD manifest which was added after the original regeneration commit and still had stale UltraSSD_LRS references. The verify job should pass now.


AI-assisted response via Claude Code

@openshift-ci-robot
Copy link

@hypershift-jira-solve-ci[bot]: This pull request references Jira Issue OCPBUGS-43449, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

Details

In response to this:

What this PR does / why we need it:

Removes UltraSSD_LRS from the AzureDiskStorageAccountType enum validation in the NodePool API. According to Azure documentation, Ultra Disks (UltraSSD_LRS) are not supported for OS Disks — they can only be used as data disks.

Changes:

  • Removed UltraSSD_LRS from the kubebuilder Enum validation on AzureDiskStorageAccountType
  • Removed the DiskStorageAccountTypesUltraSSDLRS constant
  • Removed the XValidation rule on AzureNodePoolOSDisk that referenced UltraSSD_LRS for conditional disk size constraints
  • Reduced max SizeGiB from 65,536 to 32,767 (the higher limit was only needed for UltraSSD_LRS)
  • Updated field documentation to note UltraSSD_LRS is not supported for OS disks
  • Regenerated CRDs and API docs

Which issue(s) this PR fixes:

Fixes OCPBUGS-43449

Special notes for your reviewer:

Azure Ultra Disks (UltraSSD_LRS) cannot be used as OS disks per Azure's own documentation. This change removes it from the API validation to prevent users from specifying an unsupported disk type. The valid values for OS disk storage account type are now: Premium_LRS, PremiumV2_LRS, Standard_LRS, StandardSSD_LRS.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code via /jira-solve OCPBUGS-43449 origin --ci

Always review AI generated responses prior to use.

Summary by CodeRabbit

Release Notes

  • Bug Fixes

  • Corrected Azure OS disk configuration by removing unsupported UltraSSD_LRS storage type option and reducing maximum disk size limit from 65536 GiB to 32767 GiB

  • Documentation

  • Updated reference documentation to clarify supported Azure disk storage types and OS disk size constraints

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.

OpenShift CI Bot and others added 2 commits February 19, 2026 14:32
UltraSSD_LRS (Ultra SSD) is not supported for OS Disks according to Azure
documentation (https://learn.microsoft.com/en-us/azure/virtual-machines/disks-types#disk-type-comparison).
Ultra Disks can only be used as data disks, not as OS disks.

This removes UltraSSD_LRS from the kubebuilder validation enum for
AzureDiskStorageAccountType and removes the associated constant. The
XValidation rule that referenced UltraSSD_LRS for conditional disk size
constraints is also removed since it is no longer needed. The maximum
disk size is now unconditionally capped at 32,767 GiB.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Regenerate CRD manifests and API documentation after removing
UltraSSD_LRS from AzureDiskStorageAccountType to keep generated
artifacts in sync with the API type changes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@bryan-cox
Copy link
Member

/test unit
/test verify

@bryan-cox
Copy link
Member

/lgtm

reapply lgtm since it was just a rebase

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2026
@openshift-ci-robot
Copy link

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@bryan-cox
Copy link
Member

/verified later @jiezhao16

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Feb 19, 2026
@openshift-ci-robot
Copy link

@bryan-cox: This PR has been marked to be verified later by @jiezhao16.

Details

In response to this:

/verified later @jiezhao16

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.

@sjenning sjenning added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 19, 2026
@bryan-cox
Copy link
Member

/test e2e-aks

1 similar comment
@bryan-cox
Copy link
Member

/test e2e-aks

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 20, 2026

@hypershift-jira-solve-ci[bot]: 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 195ba09 into openshift:main Feb 20, 2026
14 checks passed
@openshift-ci-robot
Copy link

@hypershift-jira-solve-ci[bot]: Jira Issue OCPBUGS-43449: All pull requests linked via external trackers have merged:

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-43449 has been moved to the MODIFIED state.

Details

In response to this:

What this PR does / why we need it:

Removes UltraSSD_LRS from the AzureDiskStorageAccountType enum validation in the NodePool API. According to Azure documentation, Ultra Disks (UltraSSD_LRS) are not supported for OS Disks — they can only be used as data disks.

Changes:

  • Removed UltraSSD_LRS from the kubebuilder Enum validation on AzureDiskStorageAccountType
  • Removed the DiskStorageAccountTypesUltraSSDLRS constant
  • Removed the XValidation rule on AzureNodePoolOSDisk that referenced UltraSSD_LRS for conditional disk size constraints
  • Reduced max SizeGiB from 65,536 to 32,767 (the higher limit was only needed for UltraSSD_LRS)
  • Updated field documentation to note UltraSSD_LRS is not supported for OS disks
  • Regenerated CRDs and API docs

Which issue(s) this PR fixes:

Fixes OCPBUGS-43449

Special notes for your reviewer:

Azure Ultra Disks (UltraSSD_LRS) cannot be used as OS disks per Azure's own documentation. This change removes it from the API validation to prevent users from specifying an unsupported disk type. The valid values for OS disk storage account type are now: Premium_LRS, PremiumV2_LRS, Standard_LRS, StandardSSD_LRS.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code via /jira-solve OCPBUGS-43449 origin --ci

Always review AI generated responses prior to use.

Summary by CodeRabbit

Release Notes

  • Bug Fixes

  • Corrected Azure OS disk configuration by removing unsupported UltraSSD_LRS storage type option and reducing maximum disk size limit from 65536 GiB to 32767 GiB

  • Documentation

  • Updated reference documentation to clarify supported Azure disk storage types and OS disk size constraints

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.

@bryan-cox bryan-cox deleted the fix-OCPBUGS-43449-v2 branch February 20, 2026 02:03
@bryan-cox
Copy link
Member

/jira backport release-4.21,release-4.20

@openshift-ci-robot
Copy link

@bryan-cox: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

Details

In response to this:

/jira backport release-4.21,release-4.20

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.

@openshift-cherrypick-robot

@openshift-ci-robot: #7727 failed to apply on top of branch "release-4.20":

Applying: fix(api): remove UltraSSD_LRS from AzureDiskStorageAccountType enum
Applying: chore(generated): regenerate CRDs and API docs
Using index info to reconstruct a base tree...
M	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml
A	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml
M	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml
A	docs/content/reference/aggregated-docs.md
M	docs/content/reference/api.md
Falling back to patching base and 3-way merge...
Auto-merging docs/content/reference/api.md
CONFLICT (modify/delete): docs/content/reference/aggregated-docs.md deleted in HEAD and modified in chore(generated): regenerate CRDs and API docs. Version chore(generated): regenerate CRDs and API docs of docs/content/reference/aggregated-docs.md left in tree.
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml
Auto-merging api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml
CONFLICT (modify/delete): api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml deleted in HEAD and modified in chore(generated): regenerate CRDs and API docs. Version chore(generated): regenerate CRDs and API docs of api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml left in tree.
Auto-merging api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 chore(generated): regenerate CRDs and API docs

Details

In response to this:

@bryan-cox: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.21,release-4.20

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.

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.

@openshift-cherrypick-robot

@openshift-ci-robot: #7727 failed to apply on top of branch "release-4.21":

Applying: fix(api): remove UltraSSD_LRS from AzureDiskStorageAccountType enum
Applying: chore(generated): regenerate CRDs and API docs
Using index info to reconstruct a base tree...
M	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml
A	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml
M	api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml
M	cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml
A	docs/content/reference/aggregated-docs.md
M	docs/content/reference/api.md
Falling back to patching base and 3-way merge...
Auto-merging docs/content/reference/api.md
CONFLICT (modify/delete): docs/content/reference/aggregated-docs.md deleted in HEAD and modified in chore(generated): regenerate CRDs and API docs. Version chore(generated): regenerate CRDs and API docs of docs/content/reference/aggregated-docs.md left in tree.
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-TechPreviewNoUpgrade.crd.yaml
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-Default.crd.yaml
Auto-merging cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/nodepools-CustomNoUpgrade.crd.yaml
Auto-merging api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/OpenStack.yaml
CONFLICT (modify/delete): api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml deleted in HEAD and modified in chore(generated): regenerate CRDs and API docs. Version chore(generated): regenerate CRDs and API docs of api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/GCPPlatform.yaml left in tree.
Auto-merging api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/nodepools.hypershift.openshift.io/AAA_ungated.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 chore(generated): regenerate CRDs and API docs

Details

In response to this:

@bryan-cox: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.21,release-4.20

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.

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.

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

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/documentation Indicates the PR includes changes for documentation area/platform/azure PR/issue for Azure (AzurePlatform) platform jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Comments