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

Replace coalescer implementation with new coalescer package #2025

Merged
merged 1 commit into from
May 2, 2024

Conversation

ConnorJC3
Copy link
Contributor

@ConnorJC3 ConnorJC3 commented Apr 26, 2024

Is this a bug fix or adding new feature?

New feature

What is this PR about? / Why do we need it?

Replaces the previous mixed-in coalescer implementation with the new package from #2024

What this PR does NOT do, on purpose:

  • Significantly change the unit tests: The unit tests could be refactored to mock the coalescer instead of cloud for the ModifyVolume tests (and probably should be, in the future). I chose not to do this in this iteration because it would be a significant overhaul, and keeping the unit tests as close as possible to the original best demonstrates this PR introduces no new bugs. I plan to refactor the coalescing-related tests in a follow up PR.
  • Refactor cloud.ModifyDiskOptions and cloud.ModifyOrResizeDisk: I think the remaining ModifyVolume code could be greatly simplified by moving the size into ModifyDiskOptions (rather than having it as a separate parameter), but this PR is not the place to do so

What testing is done?
CI/Unit Tests

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 26, 2024
Copy link

github-actions bot commented Apr 26, 2024

Code Coverage Diff

File Old Coverage New Coverage Delta
github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver/controller.go 83.0% 82.8% -0.2
github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver/controller_modify_volume.go 85.4% 77.2% -8.2

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 1, 2024
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 1, 2024
Copy link
Member

@torredil torredil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

−316 Thank you for this. This change significantly improves the modify volume implementation.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 1, 2024
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 1, 2024
Signed-off-by: Connor Catlett <conncatl@amazon.com>
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 2, 2024
@AndrewSirenko
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AndrewSirenko

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2024
@torredil
Copy link
Member

torredil commented May 2, 2024

/retest

1 similar comment
@torredil
Copy link
Member

torredil commented May 2, 2024

/retest

@k8s-ci-robot k8s-ci-robot merged commit 4438bb7 into kubernetes-sigs:master May 2, 2024
19 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants