test: fix azure disk e2e test failure

[andyzhangx]

What type of PR is this?
/kind failing-test

What this PR does / why we need it:

This PR fixed the azure disk e2e test failure, default type of azure disk has been changed to managed, so in the test, we also need to change the disk type to managed, otherwise we hit following error:

Warning  FailedAttachVolume  13s (x6 over 31s)  attachdetach-controller  AttachVolume.Attach failed for volume "vol1" : Attach volume "jsafrane-e2e-41eb8696-5c88-4906-a8c3-debf71f7b856.vhd" to instance "/subscriptions/xxx/resourceGroups/jsafrane-dev-6t8r2-rg/providers/Microsoft.Compute/virtualMachines/jsafrane-dev-6t8r2-worker-centralus2-5m9r8" failed with compute.VirtualMachinesClient#CreateOrUpdate: Failure sending request: StatusCode=0 -- Original Error: autorest/azure: Service returned an error. Status=<nil> Code="OperationNotAllowed" Message="Addition of a blob based disk to VM with managed disks is not supported." Target="dataDisk"

Which issue(s) this PR fixes:

Fixes #82272

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

none

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

none

/assign @jsafrane

cc @ritazh

/priority important-soon
/sig cloud-provider
/area provider/azure
/kind test

[jsafrane]

This PR helps a bit. I had to change also PV / in-line volume definition this way:

--- a/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go
+++ b/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go
@@ -1397,10 +1397,12 @@ func (a *azureDriver) GetVolumeSource(readOnly bool, fsType string, volume tests
 
        diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
 
+       kind := v1.AzureManagedDisk
        volSource := v1.VolumeSource{
                AzureDisk: &v1.AzureDiskVolumeSource{
                        DiskName:    diskName,
                        DataDiskURI: av.volumeName,
+                       Kind: &kind,
                        ReadOnly:    &readOnly,
                },
        }
@@ -1416,10 +1418,12 @@ func (a *azureDriver) GetPersistentVolumeSource(readOnly bool, fsType string, vo
 
        diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
 
+       kind := v1.AzureManagedDisk
        pvSource := v1.PersistentVolumeSource{
                AzureDisk: &v1.AzureDiskVolumeSource{
                        DiskName:    diskName,
                        DataDiskURI: av.volumeName,
+                       Kind: &kind,
                        ReadOnly:    &readOnly,
                },
        }

And I had to restrict any pod that runs with a such in-line volume to a zone where the volume was created (the test creates the volume in framework.TestContext.CloudConfig.Zone).

--- a/test/e2e/storage/drivers/in_tree.go
+++ b/test/e2e/storage/drivers/in_tree.go
 func (a *azureDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume {
        ginkgo.By("creating a test azure disk volume")
+       if volType == testpatterns.InlineVolume {
+               // Volume will be created in framework.TestContext.CloudConfig.Zone zone,
+               // so pods should be also scheduled there.
+               config.ClientNodeSelector = map[string]string{
+                       v1.LabelZoneFailureDomain: framework.TestContext.CloudConfig.Zone,
+               }
+       }
        volumeName, err := framework.CreatePDWithRetry()
        framework.ExpectNoError(err)
        return &azureVolume{

With these changes, I am able to run a test with in-line and pre-provisioned Azure volume.

[andyzhangx]

great, shall I merge your code change? @jsafrane

[jsafrane]

great, shall I merge your code change? @jsafrane

Yes, if it looks good for you

[jsafrane]

Thanks a lot for the PR!
/lgtm
/approve

[jsafrane]

/assign @pohly @andrewsykim
for approval

[fejta]

/retest

[andyzhangx]

ping @pohly @andrewsykim thanks

[pohly]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, jsafrane, pohly

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:

• test/e2e/framework/OWNERS [pohly]
• test/e2e/storage/OWNERS [jsafrane]

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