github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117216 from gnufied/fix-azure-disk-e2e

Browse Source 
Fix azure disk e2e after migration and while using external CCM
This commit is contained in:
Kubernetes Prow Robot 2023-04-12 08:34:32 -07:00 committed by GitHub
commit bd24043551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/storage/drivers/in_tree.go
View File

@ -1443,7 +1443,7 @@ func (a *azureDiskDriver) CreateVolume(ctx context.Context, config *storageframe
// so pods should be also scheduled there.
config.ClientNodeSelection = e2epod.NodeSelection{
Selector: map[string]string{
v1.LabelFailureDomainBetaZone: zone,
v1.LabelTopologyZone: zone,
},
}
}
@ -1745,6 +1745,10 @@ func getInlineVolumeZone(ctx context.Context, f *framework.Framework) string {
if ok {
return zone
}
topologyZone, ok := node.Labels[v1.LabelTopologyZone]
if ok {
return topologyZone
}
return ""
}