[ws-manager] use workspace class description (#19164)

Author: iQQBot

components/ws-manager-api/go/config/config.go

@@ -140,9 +140,10 @@ type Configuration struct {
 }
 
 type WorkspaceClass struct {
-	Name      string                            `json:"name"`
-	Container ContainerConfiguration            `json:"container"`
-	Templates WorkspacePodTemplateConfiguration `json:"templates"`
+	Name        string                            `json:"name"`
+	Description string                            `json:"description"`
+	Container   ContainerConfiguration            `json:"container"`
+	Templates   WorkspacePodTemplateConfiguration `json:"templates"`
 
 	// CreditsPerMinute is the cost per minute for this workspace class in credits
 	CreditsPerMinute float32 `json:"creditsPerMinute"`

components/ws-manager-mk2/service/manager.go

@@ -765,12 +765,21 @@ func (wsm *WorkspaceManagerServer) DescribeCluster(ctx context.Context, req *wsm
 	classes := make([]*wsmanapi.WorkspaceClass, 0, len(wsm.Config.WorkspaceClasses))
 	for id, class := range wsm.Config.WorkspaceClasses {
 		var cpu, ram, disk resource.Quantity
-		if class.Container.Limits != nil {
-			cpu, _ = resource.ParseQuantity(class.Container.Limits.CPU.BurstLimit)
-			ram, _ = resource.ParseQuantity(class.Container.Limits.Memory)
-			disk, _ = resource.ParseQuantity(class.Container.Limits.Storage)
+		desc := class.Description
+		if desc == "" {
+			if class.Container.Limits != nil {
+				cpu, _ = resource.ParseQuantity(class.Container.Limits.CPU.BurstLimit)
+				ram, _ = resource.ParseQuantity(class.Container.Limits.Memory)
+				disk, _ = resource.ParseQuantity(class.Container.Limits.Storage)
+			}
+			if cpu.Value() == 0 && class.Container.Requests != nil {
+				cpu, _ = resource.ParseQuantity(class.Container.Requests.CPU)
+			}
+			if ram.Value() == 0 && class.Container.Requests != nil {
+				ram, _ = resource.ParseQuantity(class.Container.Requests.Memory)
+			}
+			desc = fmt.Sprintf("%d vCPU, %dGB memory, %dGB disk", cpu.Value(), ram.ScaledValue(resource.Giga), disk.ScaledValue(resource.Giga))
 		}
-		desc := fmt.Sprintf("%d vCPU, %dGB memory, %dGB disk", cpu.Value(), ram.ScaledValue(resource.Giga), disk.ScaledValue(resource.Giga))
 		classes = append(classes, &wsmanapi.WorkspaceClass{
 			Id:               id,
 			DisplayName:      class.Name,

install/installer/pkg/components/ws-manager-mk2/configmap.go

@@ -101,7 +101,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 				return err
 			}
 			classes[k] = &config.WorkspaceClass{
-				Name: c.Name,
+				Name:        c.Name,
+				Description: c.Description,
 				Container: config.ContainerConfiguration{
 					Requests: &config.ResourceRequestConfiguration{
 						CPU:              quantityString(c.Resources.Requests, corev1.ResourceCPU),

install/installer/pkg/config/v1/experimental/experimental.go

@@ -127,9 +127,10 @@ type WorkspaceConfig struct {
 }
 
 type WorkspaceClass struct {
-	Name      string             `json:"name" validate:"required"`
-	Resources WorkspaceResources `json:"resources" validate:"required"`
-	Templates WorkspaceTemplates `json:"templates,omitempty"`
+	Name        string             `json:"name" validate:"required"`
+	Description string             `json:"description"`
+	Resources   WorkspaceResources `json:"resources" validate:"required"`
+	Templates   WorkspaceTemplates `json:"templates,omitempty"`
 }
 
 type WorkspaceResources struct {