[draft] feat: Implement KEP3751 ("ControllerModifyVolume") #2344

umagnus · 2024-06-07T03:50:27Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

feat: Implement KEP3751 ("ControllerModifyVolume")
Implements support for modifying volumes via KEP3751 (https://kep.k8s.io/3751)

Which issue(s) this PR fixes:

Fixes #

Requirements:

uses conventional commit messages
includes documentation
adds unit tests
tested upgrade from previous version

Special notes for your reviewer:

I0627 02:52:59.490914       1 utils.go:105] GRPC call: /csi.v1.Controller/ControllerModifyVolume
I0627 02:52:59.490952       1 utils.go:106] GRPC request: {"mutable_parameters":{"DiskIOPSReadWrite":"5000","DiskMBpsReadWrite":"1200"},"volume_id":"/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-526c35c8-87d2-4a67-8cee-99e3b6ce3b3f"}
I0627 02:52:59.875553       1 controllerserver.go:437] begin to modify azure disk() account type() rg() location()
I0627 02:52:59.875586       1 azure_managedDiskController.go:420] azureDisk - modifying managed Name:pvc-526c35c8-87d2-4a67-8cee-99e3b6ce3b3f, StorageAccountType:, DiskIOPSReadWrite:5000, DiskMBpsReadWrite:1200
I0627 02:53:03.174198       1 azure_managedDiskController.go:486] azureDisk - modified new MD Name:pvc-526c35c8-87d2-4a67-8cee-99e3b6ce3b3f StorageAccountType:
I0627 02:53:03.174248       1 controllerserver.go:466] modify azure disk() account type() rg() location() successfully
I0627 02:53:03.174608       1 azure_metrics.go:115] "Observed Request Latency" latency_seconds=3.298678755 request="azuredisk_csi_driver_controller_modify_volume" resource_group="mc_aks-yxytest_group_aks-yxytest_eastus" subscription_id="8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8" source="disk.csi.azure.com" volumeid="/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-526c35c8-87d2-4a67-8cee-99e3b6ce3b3f" result_code="succeeded"

I0627 06:58:30.405618       1 utils.go:105] GRPC call: /csi.v1.Controller/ControllerModifyVolume
I0627 06:58:30.405664       1 utils.go:106] GRPC request: {"mutable_parameters":{"cachingMode":"None","skuName":"StandardSSD_LRS"},"volume_id":"/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a"}
I0627 06:58:30.533276       1 controllerserver.go:437] begin to modify azure disk() account type(StandardSSD_LRS) rg() location()
I0627 06:58:30.533333       1 azure_managedDiskController.go:420] azureDisk - modifying managed Name:pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a, StorageAccountType:StandardSSD_LRS, DiskIOPSReadWrite:, DiskMBpsReadWrite:
I0627 06:58:33.598201       1 azure_managedDiskController.go:486] azureDisk - modified new MD Name:pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a StorageAccountType:StandardSSD_LRS
I0627 06:58:33.598251       1 controllerserver.go:466] modify azure disk() account type(StandardSSD_LRS) rg() location() successfully
I0627 06:58:33.598305       1 azure_metrics.go:115] "Observed Request Latency" latency_seconds=3.064952723 request="azuredisk_csi_driver_controller_modify_volume" resource_group="mc_aks-yxytest_group_aks-yxytest_eastus" subscription_id="8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8" source="disk.csi.azure.com" volumeid="/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a" result_code="succeeded"

I0627 07:14:17.551830       1 utils.go:105] GRPC call: /csi.v1.Controller/ControllerModifyVolume
I0627 07:14:17.551909       1 utils.go:106] GRPC request: {"mutable_parameters":{"skuName":"Premium_LRS"},"volume_id":"/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a"}
I0627 07:14:17.634946       1 controllerserver.go:437] begin to modify azure disk() account type(Premium_LRS) rg() location()
I0627 07:14:17.635000       1 azure_managedDiskController.go:420] azureDisk - modifying managed Name:pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a, StorageAccountType:Premium_LRS, DiskIOPSReadWrite:, DiskMBpsReadWrite:
I0627 07:14:20.141664       1 azure_managedDiskController.go:486] azureDisk - modified new MD Name:pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a StorageAccountType:Premium_LRS
I0627 07:14:20.141707       1 controllerserver.go:466] modify azure disk() account type(Premium_LRS) rg() location() successfully
I0627 07:14:20.141760       1 azure_metrics.go:115] "Observed Request Latency" latency_seconds=2.506722411 request="azuredisk_csi_driver_controller_modify_volume" resource_group="mc_aks-yxytest_group_aks-yxytest_eastus" subscription_id="8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8" source="disk.csi.azure.com" volumeid="/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/MC_aks-yxytest_group_aks-yxytest_eastus/providers/Microsoft.Compute/disks/pvc-11b511bb-c767-42c9-9fae-cf31c641ab4a" result_code="succeeded"
I0627 07:14:20.141795       1 utils.go:112] GRPC response: {}

Release note:

none

k8s-ci-robot · 2024-06-07T03:50:36Z

Hi @umagnus. 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 · 2024-06-07T03:50:55Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: umagnus
Once this PR has been reviewed and has the lgtm label, please assign edreed for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

andyzhangx · 2024-06-07T04:56:46Z

/ok-to-test

umagnus · 2024-06-26T01:46:53Z

/retest

pkg/azuredisk/azure_managedDiskController.go

pkg/azuredisk/controllerserver.go

andyzhangx · 2024-06-27T03:57:19Z

pkg/azuredisk/azure_managedDiskController.go

+	}
+
+	model := armcompute.DiskUpdate{
+		SKU: &armcompute.DiskSKU{


are these two parameters necessary in DiskUpdate struct? IMO, if only sku is needed, then only update sku, otherwise only update diskProperties

in L432, there is result, err := diskClient.Get(ctx, rg, options.DiskName) operation, is this necessary if disk sku is not going to be modified?

I move model.SKU = &armcompute.DiskSKU{ Name: to.Ptr(diskSku), } and model.Properties = &diskProperties in update needed. But I think result, err := diskClient.Get(ctx, rg, options.DiskName) is still need because we need old disk sku in L443 and L454

pkg/azuredisk/controllerserver.go

pkg/azuredisk/controllerserver_v2.go

umagnus · 2024-06-28T01:09:59Z

/retest

umagnus · 2024-06-28T05:47:51Z

/retest

andyzhangx · 2024-06-28T06:09:16Z

pkg/azuredisk/azure_managedDiskController.go

+	}
+
+	model := armcompute.DiskUpdate{}
+	result, err := diskClient.Get(ctx, rg, options.DiskName)


diskClient.Get is only needed if options.StorageAccountType != "" && options.StorageAccountType != diskSku, I think this logic should move to L446

diskSku is the previous sku which is *result.SKU.Name get from result, so I think diskClient.Get is still needed

in ModifyVolume, if user does not input new disk sku, this diskClient.Get call is not needed

But we still need diskSku in L454, one condition is that the old sku is not ultrassd or premiumv2, but cx give iops and throught and no disksku. If we don't get old disk sku, we can't determine it

andyzhangx · 2024-06-28T06:11:56Z

pkg/azuredisk/controllerserver.go

+		skuName = ""
+	}
+
+	if _, err := azureutils.NormalizeCachingMode(diskParams.CachingMode); err != nil {


why there is cachingmode check here since cachingmode change is not allowed

remove it since azuredisk cannot change PremiumV2

andyzhangx · 2024-06-28T06:12:19Z

pkg/azuredisk/controllerserver.go

+	}
+	if skuName == armcompute.DiskStorageAccountTypesPremiumV2LRS {
+		// PremiumV2LRS only supports None caching mode
+		azureutils.SetKeyValueInMap(diskParams.VolumeContext, consts.CachingModeField, string(v1.AzureDataDiskCachingNone))


so this change is also not necessary?

andyzhangx · 2024-06-28T06:12:48Z

pkg/azuredisk/controllerserver.go

+		azureutils.SetKeyValueInMap(diskParams.VolumeContext, consts.CachingModeField, string(v1.AzureDataDiskCachingNone))
+	}
+
+	metricsRequest := "controller_modify_volume"


not necessary to define a new var here since it's just used once

andyzhangx · 2024-06-28T06:13:26Z

pkg/azuredisk/controllerserver_v2.go

+		mc.ObserveOperationWithResult(isOperationSucceeded, consts.VolumeID, diskURI)
+	}()
+
+	err = localDiskController.ModifyDisk(ctx, volumeOptions)


pls make same change as v1

andyzhangx · 2024-06-28T06:18:12Z

pkg/azuredisk/controllerserver_v2.go

+		return nil, status.Error(codes.NotFound, fmt.Sprintf("Volume not found, failed with error: %v", err))
+	}
+
+	mutableParams := req.GetMutableParameters()


remove this mutableParams var define, just use req.GetMutableParameters() in L327

andyzhangx · 2024-06-28T06:18:27Z

pkg/azuredisk/controllerserver.go

+		return nil, status.Error(codes.NotFound, fmt.Sprintf("Volume not found, failed with error: %v", err))
+	}
+
+	mutableParams := req.GetMutableParameters()


remove this mutableParams var define, just use req.GetMutableParameters() in L327

andyzhangx · 2024-06-28T06:21:01Z

pkg/azuredisk/azure_managedDiskController.go

+		}
+	}
+
+	if _, err := diskClient.Patch(ctx, rg, options.DiskName, model); err != nil {


only run diskClient.Patch if model.SKU or model.Properties is not nil

andyzhangx · 2024-06-28T11:04:12Z

/retest

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 7, 2024

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 7, 2024

k8s-ci-robot requested review from andyzhangx and ZeroMagic June 7, 2024 03:50

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 Jun 7, 2024

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 25, 2024

umagnus force-pushed the modify-volume branch from 0493d59 to b7764f3 Compare June 25, 2024 07:43

add modify volume

9d14c43

umagnus force-pushed the modify-volume branch from cf3860b to 9d14c43 Compare June 27, 2024 02:19

andyzhangx reviewed Jun 27, 2024

View reviewed changes

pkg/azuredisk/controllerserver_v2.go Show resolved Hide resolved

fix

bd40aff

andyzhangx reviewed Jun 28, 2024

View reviewed changes

fix

667b436

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[draft] feat: Implement KEP3751 ("ControllerModifyVolume") #2344

[draft] feat: Implement KEP3751 ("ControllerModifyVolume") #2344

umagnus commented Jun 7, 2024 •

edited

Loading

k8s-ci-robot commented Jun 7, 2024

k8s-ci-robot commented Jun 7, 2024

andyzhangx commented Jun 7, 2024

umagnus commented Jun 26, 2024

andyzhangx Jun 27, 2024

andyzhangx Jun 27, 2024

umagnus Jun 27, 2024

umagnus commented Jun 28, 2024

umagnus commented Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx Jun 28, 2024

umagnus Jun 28, 2024

andyzhangx commented Jun 28, 2024

[draft] feat: Implement KEP3751 ("ControllerModifyVolume") #2344

Are you sure you want to change the base?

[draft] feat: Implement KEP3751 ("ControllerModifyVolume") #2344

Conversation

umagnus commented Jun 7, 2024 • edited Loading

k8s-ci-robot commented Jun 7, 2024

k8s-ci-robot commented Jun 7, 2024

andyzhangx commented Jun 7, 2024

umagnus commented Jun 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

umagnus commented Jun 28, 2024

umagnus commented Jun 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andyzhangx commented Jun 28, 2024

umagnus commented Jun 7, 2024 •

edited

Loading