--amend

Author: rafriat

workspaces/backend/internal/models/workspacekinds/funcs.go

@@ -62,7 +62,7 @@ func NewWorkspaceKindModelFromWorkspaceKind(wsk *kubefloworgv1beta1.WorkspaceKin
 		Hidden:             ptr.Deref(wsk.Spec.Spawner.Hidden, false),
 		Icon:               iconRef,
 		Logo:               logoRef,
-		// TODO: add namespaceMetrics
+		// TODO: in the future will need to support including exactly one of clusterMetrics or namespaceMetrics based on request context
 		ClusterMetrics: clusterMetrics{
 			Workspaces: wsk.Status.Workspaces,
 		},
@@ -107,6 +107,7 @@ func buildImageConfigValues(imageConfig kubefloworgv1beta1.ImageConfig, statusIm
 			Labels:      buildOptionLabels(option.Spawner.Labels),
 			Hidden:      ptr.Deref(option.Spawner.Hidden, false),
 			Redirect:    buildOptionRedirect(option.Redirect),
+			// TODO: in the future will need to support including exactly one of clusterMetrics or namespaceMetrics based on request context
 			ClusterMetrics: clusterMetrics{
 				Workspaces: statusImageConfigMap[option.Id],
 			},
@@ -126,6 +127,7 @@ func buildPodConfigValues(podConfig kubefloworgv1beta1.PodConfig, statusPodConfi
 			Labels:      buildOptionLabels(option.Spawner.Labels),
 			Hidden:      ptr.Deref(option.Spawner.Hidden, false),
 			Redirect:    buildOptionRedirect(option.Redirect),
+			// TODO: in the future will need to support including exactly one of clusterMetrics or namespaceMetrics based on request context
 			ClusterMetrics: clusterMetrics{
 				Workspaces: statusPodConfigMap[option.Id],
 			},

workspaces/backend/internal/models/workspacekinds/types.go

@@ -69,7 +69,7 @@ type ImageConfigValue struct {
 	Labels         []OptionLabel   `json:"labels"`
 	Hidden         bool            `json:"hidden"`
 	Redirect       *OptionRedirect `json:"redirect,omitempty"`
-	ClusterMetrics clusterMetrics  `json:"clusterMetrics"`
+	ClusterMetrics clusterMetrics  `json:"clusterMetrics,omitempty"`
 }
 
 type PodConfig struct {
@@ -84,7 +84,7 @@ type PodConfigValue struct {
 	Labels         []OptionLabel   `json:"labels"`
 	Hidden         bool            `json:"hidden"`
 	Redirect       *OptionRedirect `json:"redirect,omitempty"`
-	ClusterMetrics clusterMetrics  `json:"clusterMetrics"`
+	ClusterMetrics clusterMetrics  `json:"clusterMetrics,omitempty"`
 }
 
 type OptionLabel struct {