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: add attachDiskInitialDelay parameter in storage class #1872

Merged

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind feature

What this PR does / why we need it:
feat: add attachDiskInitialDelay parameter in storage class

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

feat: add attachDiskInitialDelay parameter in storage class

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 7, 2023
@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 requested review from cvvz and edreed June 7, 2023 09:46
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 7, 2023
@andyzhangx andyzhangx removed the request for review from edreed June 7, 2023 09:54
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx changed the title [WIP] feat: add attachDiskInitialDelay parameter in storage class feat: add attachDiskInitialDelay parameter in storage class Jun 8, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 8, 2023
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 9671b89 into kubernetes-sigs:master Jun 9, 2023
@andyzhangx
Copy link
Member Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

@andyzhangx: #1872 failed to apply on top of branch "release-1.26":

Applying: feat: add attachInitialDelay parameter in storage class
Using index info to reconstruct a base tree...
M	docs/driver-parameters.md
M	pkg/azureconstants/azure_constants.go
M	pkg/azuredisk/controllerserver.go
M	pkg/azureutils/azure_disk_utils.go
M	test/e2e/dynamic_provisioning_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/dynamic_provisioning_test.go
CONFLICT (content): Merge conflict in test/e2e/dynamic_provisioning_test.go
Auto-merging pkg/azureutils/azure_disk_utils.go
CONFLICT (content): Merge conflict in pkg/azureutils/azure_disk_utils.go
Auto-merging pkg/azuredisk/controllerserver.go
Auto-merging pkg/azureconstants/azure_constants.go
CONFLICT (content): Merge conflict in pkg/azureconstants/azure_constants.go
Auto-merging docs/driver-parameters.md
CONFLICT (content): Merge conflict in docs/driver-parameters.md
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: add attachInitialDelay parameter in storage class
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.26

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.

@andyzhangx
Copy link
Member Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

@andyzhangx: #1872 failed to apply on top of branch "release-1.27":

Applying: feat: add attachInitialDelay parameter in storage class
Using index info to reconstruct a base tree...
M	docs/driver-parameters.md
M	pkg/azureconstants/azure_constants.go
M	pkg/azuredisk/controllerserver.go
M	pkg/azureutils/azure_disk_utils.go
M	test/e2e/dynamic_provisioning_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/dynamic_provisioning_test.go
CONFLICT (content): Merge conflict in test/e2e/dynamic_provisioning_test.go
Auto-merging pkg/azureutils/azure_disk_utils.go
CONFLICT (content): Merge conflict in pkg/azureutils/azure_disk_utils.go
Auto-merging pkg/azuredisk/controllerserver.go
Auto-merging pkg/azureconstants/azure_constants.go
CONFLICT (content): Merge conflict in pkg/azureconstants/azure_constants.go
Auto-merging docs/driver-parameters.md
CONFLICT (content): Merge conflict in docs/driver-parameters.md
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: add attachInitialDelay parameter in storage class
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.27

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants