Merge pull request #2124 from mbarnes/pucm-worker-profiles

Provide clearer error for a particular type of PUCM failure

pkg/cluster/storageaccounts.go

@@ -5,6 +5,7 @@ package cluster
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	mgmtnetwork "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network"
@@ -24,7 +25,11 @@ func (m *manager) enableServiceEndpoints(ctx context.Context) error {
 	}
 
 	for _, wp := range m.doc.OpenShiftCluster.Properties.WorkerProfiles {
-		subnets = append(subnets, wp.SubnetID)
+		if len(wp.SubnetID) > 0 {
+			subnets = append(subnets, wp.SubnetID)
+		} else {
+			return fmt.Errorf("WorkerProfile '%s' has no SubnetID; check that the corresponding MachineSet is valid", wp.Name)
+		}
 	}
 
 	for _, subnetId := range subnets {