fix: replace deprecated labels with new labels in nodeCache update

kubernetes-sigs · Jun 6, 2023 · 16545eb · 16545eb
1 parent 9216589
commit 16545eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/provider/azure.go b/pkg/provider/azure.go
@@ -1077,7 +1077,7 @@ func (az *Cloud) updateNodeCaches(prevNode, newNode *v1.Node) {
 		az.nodeNames.Delete(prevNode.ObjectMeta.Name)
 
 		// Remove from nodeZones cache.
-		prevZone, ok := prevNode.ObjectMeta.Labels[consts.LabelFailureDomainBetaZone]
+		prevZone, ok := prevNode.ObjectMeta.Labels[v1.LabelTopologyZone]
 		if ok && az.isAvailabilityZone(prevZone) {
 			az.nodeZones[prevZone].Delete(prevNode.ObjectMeta.Name)
 			if az.nodeZones[prevZone].Len() == 0 {
@@ -1119,7 +1119,7 @@ func (az *Cloud) updateNodeCaches(prevNode, newNode *v1.Node) {
 		az.nodeNames.Insert(newNode.ObjectMeta.Name)
 
 		// Add to nodeZones cache.
-		newZone, ok := newNode.ObjectMeta.Labels[consts.LabelFailureDomainBetaZone]
+		newZone, ok := newNode.ObjectMeta.Labels[v1.LabelTopologyZone]
 		if ok && az.isAvailabilityZone(newZone) {
 			if az.nodeZones[newZone] == nil {
 				az.nodeZones[newZone] = sets.New[string]()

diff --git a/pkg/provider/azure_test.go b/pkg/provider/azure_test.go
@@ -3675,7 +3675,7 @@ func TestUpdateNodeCaches(t *testing.T) {
 	prevNode := v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
-				consts.LabelFailureDomainBetaZone: zone,
+				v1.LabelTopologyZone:              zone,
 				consts.ExternalResourceGroupLabel: consts.TrueAnnotationValue,
 				consts.ManagedByAzureLabel:        "false",
 			},
@@ -3694,7 +3694,7 @@ func TestUpdateNodeCaches(t *testing.T) {
 	newNode := v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
-				consts.LabelFailureDomainBetaZone: zone,
+				v1.LabelTopologyZone:              zone,
 				consts.ExternalResourceGroupLabel: consts.TrueAnnotationValue,
 				consts.ManagedByAzureLabel:        "false",
 				v1.LabelNodeExcludeBalancers:      "true",