Merge pull request openshift#6975 from jhixson74/master_azure_ocpbugs_8449

OCPBUGS-8449: pkg/asset/installconfig: set subscriptionID

Author: openshift-merge-robot

data/data/install.openshift.io_installconfigs.yaml

@@ -258,6 +258,7 @@ spec:
                               required:
                               - name
                               - resourceGroup
+                              - subscriptionId
                               type: object
                             diskSizeGB:
                               description: DiskSizeGB defines the size of disk in
@@ -1164,6 +1165,7 @@ spec:
                             required:
                             - name
                             - resourceGroup
+                            - subscriptionId
                             type: object
                           diskSizeGB:
                             description: DiskSizeGB defines the size of disk in GB.
@@ -2373,6 +2375,7 @@ spec:
                             required:
                             - name
                             - resourceGroup
+                            - subscriptionId
                             type: object
                           diskSizeGB:
                             description: DiskSizeGB defines the size of disk in GB.

pkg/types/azure/disk.go

@@ -36,7 +36,7 @@ type OSDisk struct {
 type DiskEncryptionSet struct {
 	// SubscriptionID defines the Azure subscription the disk encryption
 	// set is in.
-	SubscriptionID string `json:"subscriptionId,omitempty"`
+	SubscriptionID string `json:"subscriptionId"`
 	// ResourceGroup defines the Azure resource group used by the disk
 	// encryption set.
 	ResourceGroup string `json:"resourceGroup"`