Skip to content
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.

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

feat: introduce reserved-data-disk-slot-num for improved data disk volume management #2173

Merged
merged 1 commit into from
Feb 3, 2024

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Feb 2, 2024

What type of PR is this?
/kind feature

What this PR does / why we need it:
feat: introduce reserved-data-disk-slot-num for improved data disk volume management

Which issue(s) this PR fixes:

Fixes #2169

Requirements:

Special notes for your reviewer:

Release note:

feat: introduce reserved-data-disk-slot-num for improved data disk volume management

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 2, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 2, 2024
@andyzhangx andyzhangx removed the request for review from edreed February 2, 2024 04:10
@andyzhangx
Copy link
Member Author

/retest

2 similar comments
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 5b0b17a into kubernetes-sigs:master Feb 3, 2024
24 of 25 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.29

@k8s-infra-cherrypick-robot

@andyzhangx: #2173 failed to apply on top of branch "release-1.29":

Applying: feat: introduce reserved-data-disk-slot-num for improved volume mgtment
Using index info to reconstruct a base tree...
A	pkg/azuredisk/azuredisk_option.go
M	pkg/azuredisk/nodeserver.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/nodeserver.go
CONFLICT (modify/delete): pkg/azuredisk/azuredisk_option.go deleted in HEAD and modified in feat: introduce reserved-data-disk-slot-num for improved volume mgtment. Version feat: introduce reserved-data-disk-slot-num for improved volume mgtment of pkg/azuredisk/azuredisk_option.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: introduce reserved-data-disk-slot-num for improved volume mgtment
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.29

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/test-infra repository.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proposal: Introducing reservedDataDiskSlots for improved disk count management
3 participants