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

Update logic to use SI for VACs #1841

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Conversation

travisyx
Copy link
Contributor

@travisyx travisyx commented Oct 4, 2024

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

This PR updates the logic to accept SI units for throughput for VolumeAttributesClasses. This makes the VACs consistent with SI being used in other areas, such as in StorageClasses. This also removes the duplicate definition of the command line arguments in the dev overlay.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

This feature changes VolumeAttributesClass, so throughput specifications will need "Mi".

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 4, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @travisyx. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 4, 2024
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 25, 2024
@amacaskill
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Oct 25, 2024
@@ -9,14 +9,6 @@ resources:
# Here dev overlay is using the same image as alpha
transformers:
- ../../images/stable-master
# Apply patches to support dynamic provisioning for hyperdisks
Copy link
Member

Choose a reason for hiding this comment

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

Why is this / driver-args.yaml being deleted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There shouldn't be a need for the driver-args as the command line arguments are in the base controller.yaml.

@amacaskill
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amacaskill, heikofkoehler, travisyx

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 Oct 25, 2024
@k8s-ci-robot k8s-ci-robot merged commit e3f0d26 into kubernetes-sigs:master Oct 25, 2024
7 checks passed
@travisyx
Copy link
Contributor Author

travisyx commented Nov 5, 2024

/cherry-pick release-1.15

@k8s-infra-cherrypick-robot

@travisyx: only kubernetes-sigs org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

In response to this:

/cherry-pick release-1.15

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.

@mattcary
Copy link
Contributor

mattcary commented Nov 5, 2024

/cherry-pick release-1.15

lgtm

@k8s-infra-cherrypick-robot

@mattcary: #1841 failed to apply on top of branch "release-1.15":

Applying: Update logic to use SI for VACs
Using index info to reconstruct a base tree...
A	examples/kubernetes/demo-vol-create.yaml
M	test/e2e/tests/single_zone_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/tests/single_zone_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/tests/single_zone_e2e_test.go
CONFLICT (modify/delete): examples/kubernetes/demo-vol-create.yaml deleted in HEAD and modified in Update logic to use SI for VACs. Version Update logic to use SI for VACs of examples/kubernetes/demo-vol-create.yaml left in tree.
Removing deploy/kubernetes/overlays/dev/driver-args.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 advice.mergeConflict false"
Patch failed at 0001 Update logic to use SI for VACs

In response to this:

/cherry-pick release-1.15

lgtm

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.

@mattcary
Copy link
Contributor

mattcary commented Nov 5, 2024

@travisyx looks like it can't cherry-pick cleanly, you'll have to make a PR by running git cherry-pick manually & clean up the merge conflicts.

k8s-ci-robot added a commit that referenced this pull request Nov 5, 2024
…1836-#1838-#1841-upstream-release-1.15

Automated cherry pick of #1826: Add ControllerModifyVolume E2E tests
#1836: Create documentation for ControllerModifyVolume and controller default
#1838: Enable VolumeAttributesClass feature gate for CI runs
#1841: Update logic to use SI for VACs
travisyx added a commit to travisyx/gcp-compute-persistent-disk-csi-driver that referenced this pull request Nov 12, 2024
…ModifyVolume E2E tests

kubernetes-sigs#1836: Create documentation for ControllerModifyVolume and controller default
kubernetes-sigs#1838: Enable VolumeAttributesClass feature gate for CI runs
kubernetes-sigs#1841: Update logic to use SI for VACs"
amacaskill added a commit that referenced this pull request Nov 13, 2024
…ick-of-#1826-#1836-#1838-#1841-upstream-release-1.15

Revert "Automated cherry pick of #1826: Add ControllerModifyVolume E2E tests#1836: Create documentation for ControllerModifyVolume and controller default#1838: Enable VolumeAttributesClass feature gate for CI runs#1841: Update logic to use SI for VACs"
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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

6 participants