Merge pull request openshift#7076 from jhixson74/master_azure_ocpbugs_8449

OCPBUGS-8449: Azure: don't set default subscriptionID for disk encryption sets

Author: openshift-merge-robot

pkg/asset/machines/master.go

@@ -351,11 +351,6 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 			return errors.Wrap(err, "failed to fetch session")
 		}
 
-		// Default to current subscription if one was not specified
-		if mpool.OSDisk.DiskEncryptionSet != nil && mpool.OSDisk.DiskEncryptionSet.SubscriptionID == "" {
-			mpool.OSDisk.DiskEncryptionSet.SubscriptionID = session.Credentials.SubscriptionID
-		}
-
 		client := icazure.NewClient(session)
 		if len(mpool.Zones) == 0 {
 			azs, err := client.GetAvailabilityZones(context.TODO(), ic.Platform.Azure.Region, mpool.InstanceType)

pkg/asset/machines/worker.go

@@ -436,11 +436,6 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 				return errors.Wrap(err, "failed to fetch session")
 			}
 
-			// Default to current subscription if one was not specified
-			if mpool.OSDisk.DiskEncryptionSet != nil && mpool.OSDisk.DiskEncryptionSet.SubscriptionID == "" {
-				mpool.OSDisk.DiskEncryptionSet.SubscriptionID = session.Credentials.SubscriptionID
-			}
-
 			client := icazure.NewClient(session)
 			if len(mpool.Zones) == 0 {
 				azs, err := client.GetAvailabilityZones(context.TODO(), ic.Platform.Azure.Region, mpool.InstanceType)

pkg/types/azure/validation/disk.go

@@ -31,7 +31,10 @@ func ValidateDiskEncryption(p *azure.MachinePool, cloudName azure.CloudEnvironme
 	if diskEncryptionSet != nil && cloudName == azure.StackCloud {
 		return append(allErrs, field.Invalid(childFldPath.Child("diskEncryptionSet"), diskEncryptionSet, "disk encryption sets are not supported on this platform"))
 	}
-	if diskEncryptionSet.SubscriptionID != "" && !RxSubscriptionID.MatchString(diskEncryptionSet.SubscriptionID) {
+	if diskEncryptionSet.SubscriptionID == "" {
+		return append(allErrs, field.Required(childFldPath.Child("subscriptionID"), "subscription ID is required"))
+	}
+	if !RxSubscriptionID.MatchString(diskEncryptionSet.SubscriptionID) {
 		return append(allErrs, field.Invalid(childFldPath.Child("subscriptionID"), diskEncryptionSet.SubscriptionID, "invalid subscription ID format"))
 	}
 	if !RxResourceGroup.MatchString(diskEncryptionSet.ResourceGroup) {