Add worker profile status (#3053)

* add workerProfilesStatus field to hold the enriched worker profile data * update swagger * swagger examples * update clients * resolve golint * update defaults * validate worker Profile status is nil in input request * make client changes after rebase * rebase * update workerProfiles references and UTs * fix golint errors * remove duplicate logic of verifing workerProfilesStatus not nil --------- Co-authored-by: gniranjan <[email protected]>
Azure · Sep 5, 2023 · dba48c1 · dba48c1
1 parent 91a0357
commit dba48c1
Show file tree

Hide file tree

Showing 58 changed files with 629 additions and 91 deletions.
diff --git a/.sha256sum b/.sha256sum
@@ -4,4 +4,4 @@
 1d167031baf0209fe8c46df9654585c64e8cc9a0c89555d7479c4ed6dc150251  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
 622404e8311c62f27fba778e30e760bb1901e5bd221b23de72f449cafbdf0c45  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json
 3aede70b183bad612c23cb776fe5a932c5709334e1fe1ad7ff8772b58be3661f  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
-0c2bfc4b4308ff10d3cdd1c66c1356ba4153342ce536d478bcbb515fa1fe5958  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-09-04/redhatopenshift.json
+3127f0a6acebf9ce09623df69dbd88824384b58967fe36c19acf2e2cf34c46b2  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-09-04/redhatopenshift.json
diff --git a/pkg/api/admin/openshiftcluster.go b/pkg/api/admin/openshiftcluster.go
@@ -28,33 +28,36 @@ type OpenShiftCluster struct {
 
 // OpenShiftClusterProperties represents an OpenShift cluster's properties.
 type OpenShiftClusterProperties struct {
-	ArchitectureVersion             ArchitectureVersion     `json:"architectureVersion"` // ArchitectureVersion is int so 0 is valid value to be returned
-	ProvisioningState               ProvisioningState       `json:"provisioningState,omitempty"`
-	LastProvisioningState           ProvisioningState       `json:"lastProvisioningState,omitempty"`
-	FailedProvisioningState         ProvisioningState       `json:"failedProvisioningState,omitempty"`
-	LastAdminUpdateError            string                  `json:"lastAdminUpdateError,omitempty"`
-	MaintenanceTask                 MaintenanceTask         `json:"maintenanceTask,omitempty" mutable:"true"`
-	OperatorFlags                   OperatorFlags           `json:"operatorFlags,omitempty" mutable:"true"`
-	OperatorVersion                 string                  `json:"operatorVersion,omitempty" mutable:"true"`
-	CreatedAt                       time.Time               `json:"createdAt,omitempty"`
-	CreatedBy                       string                  `json:"createdBy,omitempty"`
-	ProvisionedBy                   string                  `json:"provisionedBy,omitempty"`
-	ClusterProfile                  ClusterProfile          `json:"clusterProfile,omitempty"`
-	FeatureProfile                  FeatureProfile          `json:"featureProfile,omitempty"`
-	ConsoleProfile                  ConsoleProfile          `json:"consoleProfile,omitempty"`
-	ServicePrincipalProfile         ServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"`
-	NetworkProfile                  NetworkProfile          `json:"networkProfile,omitempty"`
-	MasterProfile                   MasterProfile           `json:"masterProfile,omitempty"`
-	WorkerProfiles                  []WorkerProfile         `json:"workerProfiles,omitempty"`
-	APIServerProfile                APIServerProfile        `json:"apiserverProfile,omitempty"`
-	IngressProfiles                 []IngressProfile        `json:"ingressProfiles,omitempty"`
-	Install                         *Install                `json:"install,omitempty"`
-	StorageSuffix                   string                  `json:"storageSuffix,omitempty"`
-	RegistryProfiles                []RegistryProfile       `json:"registryProfiles,omitempty"`
-	ImageRegistryStorageAccountName string                  `json:"imageRegistryStorageAccountName,omitempty"`
-	InfraID                         string                  `json:"infraId,omitempty"`
-	HiveProfile                     HiveProfile             `json:"hiveProfile,omitempty"`
-	PucmPending                     bool                    `json:"pucmPending,omitempty"`
+	ArchitectureVersion     ArchitectureVersion     `json:"architectureVersion"` // ArchitectureVersion is int so 0 is valid value to be returned
+	ProvisioningState       ProvisioningState       `json:"provisioningState,omitempty"`
+	LastProvisioningState   ProvisioningState       `json:"lastProvisioningState,omitempty"`
+	FailedProvisioningState ProvisioningState       `json:"failedProvisioningState,omitempty"`
+	LastAdminUpdateError    string                  `json:"lastAdminUpdateError,omitempty"`
+	MaintenanceTask         MaintenanceTask         `json:"maintenanceTask,omitempty" mutable:"true"`
+	OperatorFlags           OperatorFlags           `json:"operatorFlags,omitempty" mutable:"true"`
+	OperatorVersion         string                  `json:"operatorVersion,omitempty" mutable:"true"`
+	CreatedAt               time.Time               `json:"createdAt,omitempty"`
+	CreatedBy               string                  `json:"createdBy,omitempty"`
+	ProvisionedBy           string                  `json:"provisionedBy,omitempty"`
+	ClusterProfile          ClusterProfile          `json:"clusterProfile,omitempty"`
+	FeatureProfile          FeatureProfile          `json:"featureProfile,omitempty"`
+	ConsoleProfile          ConsoleProfile          `json:"consoleProfile,omitempty"`
+	ServicePrincipalProfile ServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"`
+	NetworkProfile          NetworkProfile          `json:"networkProfile,omitempty"`
+	MasterProfile           MasterProfile           `json:"masterProfile,omitempty"`
+	// WorkerProfiles is used to store the worker profile data that was sent in the api request
+	WorkerProfiles []WorkerProfile `json:"workerProfiles,omitempty"`
+	// WorkerProfilesStatus is used to store the enriched worker profile data
+	WorkerProfilesStatus            []WorkerProfile   `json:"workerProfilesStatus,omitempty"`
+	APIServerProfile                APIServerProfile  `json:"apiserverProfile,omitempty"`
+	IngressProfiles                 []IngressProfile  `json:"ingressProfiles,omitempty"`
+	Install                         *Install          `json:"install,omitempty"`
+	StorageSuffix                   string            `json:"storageSuffix,omitempty"`
+	RegistryProfiles                []RegistryProfile `json:"registryProfiles,omitempty"`
+	ImageRegistryStorageAccountName string            `json:"imageRegistryStorageAccountName,omitempty"`
+	InfraID                         string            `json:"infraId,omitempty"`
+	HiveProfile                     HiveProfile       `json:"hiveProfile,omitempty"`
+	PucmPending                     bool              `json:"pucmPending,omitempty"`
 }
 
 // ProvisioningState represents a provisioning state.

diff --git a/pkg/api/admin/openshiftcluster_convert.go b/pkg/api/admin/openshiftcluster_convert.go
@@ -131,6 +131,21 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 		}
 	}
 
+	if oc.Properties.WorkerProfilesStatus != nil {
+		out.Properties.WorkerProfilesStatus = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfilesStatus))
+		for _, p := range oc.Properties.WorkerProfilesStatus {
+			out.Properties.WorkerProfilesStatus = append(out.Properties.WorkerProfilesStatus, WorkerProfile{
+				Name:                p.Name,
+				VMSize:              VMSize(p.VMSize),
+				DiskSizeGB:          p.DiskSizeGB,
+				SubnetID:            p.SubnetID,
+				Count:               p.Count,
+				EncryptionAtHost:    EncryptionAtHost(p.EncryptionAtHost),
+				DiskEncryptionSetID: p.DiskEncryptionSetID,
+			})
+		}
+	}
+
 	if oc.Properties.IngressProfiles != nil {
 		out.Properties.IngressProfiles = make([]IngressProfile, 0, len(oc.Properties.IngressProfiles))
 		for _, p := range oc.Properties.IngressProfiles {
@@ -285,6 +300,20 @@ func (c openShiftClusterConverter) ToInternal(_oc interface{}, out *api.OpenShif
 			out.Properties.WorkerProfiles[i].DiskEncryptionSetID = oc.Properties.WorkerProfiles[i].DiskEncryptionSetID
 		}
 	}
+	if oc.Properties.WorkerProfilesStatus != nil {
+		out.Properties.WorkerProfilesStatus = make([]api.WorkerProfile, len(oc.Properties.WorkerProfilesStatus))
+		for _, p := range oc.Properties.WorkerProfilesStatus {
+			out.Properties.WorkerProfilesStatus = append(out.Properties.WorkerProfilesStatus, api.WorkerProfile{
+				Name:                p.Name,
+				VMSize:              api.VMSize(p.VMSize),
+				DiskSizeGB:          p.DiskSizeGB,
+				SubnetID:            p.SubnetID,
+				Count:               p.Count,
+				EncryptionAtHost:    api.EncryptionAtHost(p.EncryptionAtHost),
+				DiskEncryptionSetID: p.DiskEncryptionSetID,
+			})
+		}
+	}
 	out.Properties.APIServerProfile.Visibility = api.Visibility(oc.Properties.APIServerProfile.Visibility)
 	out.Properties.APIServerProfile.URL = oc.Properties.APIServerProfile.URL
 	out.Properties.APIServerProfile.IP = oc.Properties.APIServerProfile.IP

diff --git a/pkg/api/defaults.go b/pkg/api/defaults.go
@@ -21,6 +21,12 @@ func SetDefaults(doc *OpenShiftClusterDocument) {
 			}
 		}
 
+		for i, wp := range doc.OpenShiftCluster.Properties.WorkerProfilesStatus {
+			if wp.EncryptionAtHost == "" {
+				doc.OpenShiftCluster.Properties.WorkerProfilesStatus[i].EncryptionAtHost = EncryptionAtHostDisabled
+			}
+		}
+
 		if doc.OpenShiftCluster.Properties.ClusterProfile.FipsValidatedModules == "" {
 			doc.OpenShiftCluster.Properties.ClusterProfile.FipsValidatedModules = FipsValidatedModulesDisabled
 		}

diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go
@@ -31,6 +31,11 @@ func validOpenShiftClusterDocument() *OpenShiftClusterDocument {
 						EncryptionAtHost: EncryptionAtHostDisabled,
 					},
 				},
+				WorkerProfilesStatus: []WorkerProfile{
+					{
+						EncryptionAtHost: EncryptionAtHostDisabled,
+					},
+				},
 				ClusterProfile: ClusterProfile{
 					FipsValidatedModules: FipsValidatedModulesDisabled,
 				},

diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go
@@ -126,8 +126,12 @@ type OpenShiftClusterProperties struct {
 
 	MasterProfile MasterProfile `json:"masterProfile,omitempty"`
 
+	// WorkerProfiles is used to store the worker profile data that was sent in the api request
 	WorkerProfiles []WorkerProfile `json:"workerProfiles,omitempty"`
 
+	// WorkerProfilesStatus is used to store the enriched worker profile data
+	WorkerProfilesStatus []WorkerProfile `json:"workerProfilesStatus,omitempty"`
+
 	APIServerProfile APIServerProfile `json:"apiserverProfile,omitempty"`
 
 	IngressProfiles []IngressProfile `json:"ingressProfiles,omitempty"`
@@ -632,6 +636,15 @@ type WorkerProfile struct {
 	DiskEncryptionSetID string           `json:"diskEncryptionSetId,omitempty"`
 }
 
+// GetEnrichedWorkerProfiles returns WorkerProfilesStatus if not nil, otherwise WorkerProfiles
+// with their respective json property name
+func GetEnrichedWorkerProfiles(ocp OpenShiftClusterProperties) ([]WorkerProfile, string) {
+	if ocp.WorkerProfilesStatus != nil {
+		return ocp.WorkerProfilesStatus, "workerProfilesStatus"
+	}
+	return ocp.WorkerProfiles, "workerProfiles"
+}
+
 // APIServerProfile represents an API server profile
 type APIServerProfile struct {
 	MissingFields

diff --git a/pkg/api/openshiftclusterdocument_example.go b/pkg/api/openshiftclusterdocument_example.go
@@ -67,6 +67,29 @@ func ExampleOpenShiftClusterDocument() *OpenShiftClusterDocument {
 						Count:      3,
 					},
 				},
+				WorkerProfilesStatus: []WorkerProfile{
+					{
+						Name:       "worker1",
+						VMSize:     VMSizeStandardD2sV3,
+						DiskSizeGB: 128,
+						SubnetID:   "/subscriptions/subscriptionId/resourceGroups/vnetResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet/subnets/worker",
+						Count:      1,
+					},
+					{
+						Name:       "worker2",
+						VMSize:     VMSizeStandardD2sV3,
+						DiskSizeGB: 128,
+						SubnetID:   "/subscriptions/subscriptionId/resourceGroups/vnetResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet/subnets/worker",
+						Count:      1,
+					},
+					{
+						Name:       "worker3",
+						VMSize:     VMSizeStandardD2sV3,
+						DiskSizeGB: 128,
+						SubnetID:   "/subscriptions/subscriptionId/resourceGroups/vnetResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet/subnets/worker",
+						Count:      1,
+					},
+				},
 				APIServerProfile: APIServerProfile{
 					Visibility: VisibilityPublic,
 					URL:        "https://api.cluster.location.aroapp.io:6443/",

diff --git a/pkg/api/util/subnet/subnet.go b/pkg/api/util/subnet/subnet.go
@@ -33,7 +33,9 @@ func NetworkSecurityGroupID(oc *api.OpenShiftCluster, subnetID string) (string,
 		infraID = "aro"
 	}
 	isWorkerSubnet := false
-	for _, s := range oc.Properties.WorkerProfiles {
+	workerProfiles, _ := api.GetEnrichedWorkerProfiles(oc.Properties)
+
+	for _, s := range workerProfiles {
 		if strings.EqualFold(subnetID, s.SubnetID) {
 			isWorkerSubnet = true
 			break

diff --git a/pkg/api/util/subnet/subnet_test.go b/pkg/api/util/subnet/subnet_test.go
@@ -32,6 +32,7 @@ func TestNetworkSecurityGroupID(t *testing.T) {
 		infraID     string
 		archVersion api.ArchitectureVersion
 		subnetID    string
+		wpStatus    bool
 		wantNSGID   string
 		wantErr     string
 	}{
@@ -64,11 +65,27 @@ func TestNetworkSecurityGroupID(t *testing.T) {
 			archVersion: api.ArchitectureVersion(42),
 			wantErr:     `unknown architecture version 42`,
 		},
+		{
+			name:        "worker arch v2 to use enriched worker Profile",
+			infraID:     "test-1234",
+			archVersion: api.ArchitectureVersionV2,
+			wpStatus:    true,
+			subnetID:    "/subscriptions/subscriptionId/resourceGroups/vnetResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet/subnets/Enrichedworker",
+			wantNSGID:   "/subscriptions/subscriptionId/resourceGroups/clusterResourceGroup/providers/Microsoft.Network/networkSecurityGroups/test-1234-nsg",
+		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			oc.Properties.InfraID = tt.infraID
 			oc.Properties.ArchitectureVersion = tt.archVersion
 
+			if tt.wpStatus {
+				oc.Properties.WorkerProfilesStatus = []api.WorkerProfile{
+					{
+						SubnetID: "/subscriptions/subscriptionId/resourceGroups/vnetResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet/subnets/Enrichedworker",
+					},
+				}
+			}
+
 			nsgID, err := NetworkSecurityGroupID(oc, tt.subnetID)
 			utilerror.AssertErrorMessage(t, err, tt.wantErr)
 

diff --git a/pkg/api/v20191231preview/openshiftcluster_convert.go b/pkg/api/v20191231preview/openshiftcluster_convert.go
@@ -51,8 +51,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:       p.Name,
 				VMSize:     VMSize(p.VMSize),

diff --git a/pkg/api/v20191231preview/openshiftcluster_example.go b/pkg/api/v20191231preview/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }
 

diff --git a/pkg/api/v20200430/openshiftcluster_convert.go b/pkg/api/v20200430/openshiftcluster_convert.go
@@ -51,8 +51,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:       p.Name,
 				VMSize:     VMSize(p.VMSize),

diff --git a/pkg/api/v20200430/openshiftcluster_example.go b/pkg/api/v20200430/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }
 

diff --git a/pkg/api/v20210901preview/openshiftcluster_convert.go b/pkg/api/v20210901preview/openshiftcluster_convert.go
@@ -54,8 +54,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:                p.Name,
 				VMSize:              VMSize(p.VMSize),

diff --git a/pkg/api/v20210901preview/openshiftcluster_example.go b/pkg/api/v20210901preview/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }
 

diff --git a/pkg/api/v20220401/openshiftcluster_convert.go b/pkg/api/v20220401/openshiftcluster_convert.go
@@ -54,8 +54,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:                p.Name,
 				VMSize:              VMSize(p.VMSize),

diff --git a/pkg/api/v20220401/openshiftcluster_example.go b/pkg/api/v20220401/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }
 

diff --git a/pkg/api/v20220904/openshiftcluster_convert.go b/pkg/api/v20220904/openshiftcluster_convert.go
@@ -54,8 +54,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:                p.Name,
 				VMSize:              VMSize(p.VMSize),

diff --git a/pkg/api/v20220904/openshiftcluster_example.go b/pkg/api/v20220904/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }
 

diff --git a/pkg/api/v20230401/openshiftcluster_convert.go b/pkg/api/v20230401/openshiftcluster_convert.go
@@ -55,8 +55,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.WorkerProfiles != nil {
-		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(oc.Properties.WorkerProfiles))
-		for _, p := range oc.Properties.WorkerProfiles {
+		workerProfiles := oc.Properties.WorkerProfiles
+
+		// Use enriched worker profile data when available
+		if oc.Properties.WorkerProfilesStatus != nil {
+			workerProfiles = oc.Properties.WorkerProfilesStatus
+		}
+
+		out.Properties.WorkerProfiles = make([]WorkerProfile, 0, len(workerProfiles))
+		for _, p := range workerProfiles {
 			out.Properties.WorkerProfiles = append(out.Properties.WorkerProfiles, WorkerProfile{
 				Name:                p.Name,
 				VMSize:              VMSize(p.VMSize),

diff --git a/pkg/api/v20230401/openshiftcluster_example.go b/pkg/api/v20230401/openshiftcluster_example.go
@@ -9,6 +9,7 @@ import (
 
 func exampleOpenShiftCluster() *OpenShiftCluster {
 	doc := api.ExampleOpenShiftClusterDocument()
+	doc.OpenShiftCluster.Properties.WorkerProfilesStatus = nil
 	return (&openShiftClusterConverter{}).ToExternal(doc.OpenShiftCluster).(*OpenShiftCluster)
 }