mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-10 20:42:26 +00:00
Fix azure disk e2e after migration
This commit is contained in:
parent
ad18954259
commit
901dea7307
@ -1443,7 +1443,7 @@ func (a *azureDiskDriver) CreateVolume(ctx context.Context, config *storageframe
|
|||||||
// so pods should be also scheduled there.
|
// so pods should be also scheduled there.
|
||||||
config.ClientNodeSelection = e2epod.NodeSelection{
|
config.ClientNodeSelection = e2epod.NodeSelection{
|
||||||
Selector: map[string]string{
|
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 {
|
if ok {
|
||||||
return zone
|
return zone
|
||||||
}
|
}
|
||||||
|
topologyZone, ok := node.Labels[v1.LabelTopologyZone]
|
||||||
|
if ok {
|
||||||
|
return topologyZone
|
||||||
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user