addressed feedback

Author: iQQBot

components/ws-daemon/pkg/controller/workspace_controller.go

@@ -223,28 +223,36 @@ func (wsc *WorkspaceController) handleWorkspaceRunning(ctx context.Context, ws *
 
 	var imageInfo *workspacev1.WorkspaceImageInfo = nil
 	if ws.Status.ImageInfo == nil {
-		ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-		defer cancel()
-		id, err := wsc.runtime.WaitForContainer(ctx, ws.Name)
-		if err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to wait for container: %w", err)
-		}
-		info, err := wsc.runtime.GetContainerImageInfo(ctx, id)
-		if err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to get container image info: %w", err)
-		}
+		getImageInfo := func() (*workspacev1.WorkspaceImageInfo, error) {
+			ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+			defer cancel()
+			id, err := wsc.runtime.WaitForContainer(ctx, ws.Name)
+			if err != nil {
+				return nil, fmt.Errorf("failed to wait for container: %w", err)
+			}
+			info, err := wsc.runtime.GetContainerImageInfo(ctx, id)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get container image info: %w", err)
+			}
 
-		err = retry.RetryOnConflict(retryParams, func() error {
-			if err := wsc.Get(ctx, req.NamespacedName, ws); err != nil {
-				return err
+			err = retry.RetryOnConflict(retryParams, func() error {
+				if err := wsc.Get(ctx, req.NamespacedName, ws); err != nil {
+					return err
+				}
+				ws.Status.ImageInfo = info
+				return wsc.Status().Update(ctx, ws)
+			})
+			if err != nil {
+				return info, fmt.Errorf("failed to update workspace with image info: %w", err)
 			}
-			ws.Status.ImageInfo = info
-			return wsc.Status().Update(ctx, ws)
-		})
+			return info, nil
+		}
+		imageInfo, err = getImageInfo()
 		if err != nil {
-			glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).WithField("phase", ws.Status.Phase).Errorf("failed to update workspace with image info: %v", err)
+			glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).Errorf("failed to get image info: %v", err)
+		} else {
+			glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).WithField("imageInfo", glog.TrustedValueWrap{Value: imageInfo}).Info("updated image info")
 		}
-		imageInfo = info
 	}
 	return ctrl.Result{}, wsc.operations.SetupWorkspace(ctx, ws.Name, imageInfo)
 }