search

kubernetes-sigs / azuredisk-csi-driver

Azure Disk CSI Driver
Apache License 2.0
147 stars 193 forks source link

fix: vm-type is not overriding as expected #2578

Closed umagnus closed 3 weeks ago

umagnus commented 4 weeks ago

What type of PR is this?

/kind bug

What this PR does / why we need it:

fix: vm-type is not overriding as expected

Which issue(s) this PR fixes:

Fixes #2533

Requirements:

Special notes for your reviewer: azuredisk log:

I1104 06:08:41.447295       1 azuredisk.go:223] override VMType(vmss) in cloud config as standard
I1104 06:08:41.447305       1 azuredisk.go:230] disable UseInstanceMetadata for controller
I1104 06:08:41.447316       1 azuredisk.go:242] cloud: AzurePublicCloud, location: eastus2, rg: MC_aks-yxytest_group_aks-yxytest_eastus2, VMType: standard, PrimaryScaleSetName: aks-userpool-34645390-vmss, PrimaryAvailabilitySetName: , DisableAvailabilitySetNodes: false
I1104 06:08:41.450388       1 mount_linux.go:285] 'umount /tmp/kubelet-detect-safe-umount492110992' failed with: exit status 32, output: umount: /tmp/kubelet-detect-safe-umount492110992: must be superuser to unmount.
I1104 06:08:41.450432       1 mount_linux.go:287] Detected umount with unsafe 'not mounted' behavior
I1104 06:08:41.450485       1 driver.go:82] Enabling controller service capability: CREATE_DELETE_VOLUME
I1104 06:08:41.450493       1 driver.go:82] Enabling controller service capability: PUBLISH_UNPUBLISH_VOLUME

test to add a log in GetNodeVMSet function to print az.VMType, and it returns:

I1104 08:09:17.486821       1 azure.go:1498] getNodeVMSet: vmType is "standard", return VMSet directly

The VMType is overrided as standard

Release note:

none
k8s-ci-robot commented 4 weeks ago

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](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
cvvz commented 3 weeks ago

/ok-to-test

umagnus commented 3 weeks ago

/retest

umagnus commented 3 weeks ago

/retest

umagnus commented 3 weeks ago

/retest

k8s-ci-robot commented 3 weeks ago

@umagnus: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azuredisk-csi-driver-external-e2e-single-az 7b8a1590d69c059ee2a97c511e0e3ad5fc4ca795 link true /test pull-azuredisk-csi-driver-external-e2e-single-az

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
k8s-ci-robot commented 3 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, umagnus

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: - ~~[OWNERS](https://github.com/kubernetes-sigs/azuredisk-csi-driver/blob/master/OWNERS)~~ [andyzhangx] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
andyzhangx commented 3 weeks ago

/cherrypick release-1.31

andyzhangx commented 3 weeks ago

/cherrypick release-1.30

andyzhangx commented 3 weeks ago

/cherrypick release-1.29

andyzhangx commented 3 weeks ago

/cherrypick release-1.28

k8s-infra-cherrypick-robot commented 3 weeks ago

@andyzhangx: #2578 failed to apply on top of branch "release-1.29":

Applying: fix override vmtype
Using index info to reconstruct a base tree...
M   pkg/azuredisk/azuredisk.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/azuredisk.go
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 fix override vmtype
In response to [this](https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2578#issuecomment-2454088882): >/cherrypick release-1.29 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 weeks ago

@andyzhangx: new pull request created: #2580

In response to [this](https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2578#issuecomment-2454088581): >/cherrypick release-1.31 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 weeks ago

@andyzhangx: new pull request created: #2581

In response to [this](https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2578#issuecomment-2454088767): >/cherrypick release-1.30 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 weeks ago

@andyzhangx: #2578 failed to apply on top of branch "release-1.28":

Applying: fix override vmtype
Using index info to reconstruct a base tree...
M   pkg/azuredisk/azuredisk.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/azuredisk.go
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 fix override vmtype
In response to [this](https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2578#issuecomment-2454089040): >/cherrypick release-1.28 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.