From 901dea73073c5985563a7d6cdec9b7b1a6d0a3e2 Mon Sep 17 00:00:00 2001
From: Hemant Kumar <hekumar@redhat.com>
Date: Tue, 11 Apr 2023 15:02:25 -0400
Subject: [PATCH] Fix azure disk e2e after migration

---
 test/e2e/storage/drivers/in_tree.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go
index 573bd4b7a95..223bc463655 100644
--- a/test/e2e/storage/drivers/in_tree.go
+++ b/test/e2e/storage/drivers/in_tree.go
@@ -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 ""
 }