Only set nodeSelectorTerms when there are zoned nodes

pkg/volume/azure_dd/azure_provision.go

@@ -304,6 +304,7 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
 
 		if zoned {
 			// Set node affinity labels based on availability zone labels.
+			if len(labels) > 0 {
 				requirements := make([]v1.NodeSelectorRequirement, 0)
 				for k, v := range labels {
 					requirements = append(requirements, v1.NodeSelectorRequirement{Key: k, Operator: v1.NodeSelectorOpIn, Values: []string{v}})
@@ -312,6 +313,7 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
 				nodeSelectorTerms = append(nodeSelectorTerms, v1.NodeSelectorTerm{
 					MatchExpressions: requirements,
 				})
+			}
 		} else {
 			// Set node affinity labels based on fault domains.
 			// This is required because unzoned AzureDisk can't be attached to zoned nodes.
@@ -336,12 +338,14 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
 			}
 		}
 
+		if len(nodeSelectorTerms) > 0 {
 			pv.Spec.NodeAffinity = &v1.VolumeNodeAffinity{
 				Required: &v1.NodeSelector{
 					NodeSelectorTerms: nodeSelectorTerms,
 				},
 			}
 		}
+	}
 
 	return pv, nil
 }