1

Author: iQQBot

components/registry-facade/pkg/registry/manifest.go

@@ -12,6 +12,7 @@ import (
 	"io"
 	"mime"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
@@ -185,15 +186,23 @@ func (mh *manifestHandler) getManifest(w http.ResponseWriter, r *http.Request) {
 				return err
 			}
 
+			originImageSize := 0
+			for _, layer := range manifest.Layers {
+				originImageSize += int(layer.Size)
+			}
+
 			// modify config
 			addonLayer, err := mh.ConfigModifier(ctx, mh.Spec, cfg)
 			if err != nil {
 				log.WithError(err).WithFields(logFields).Error("cannot modify config")
 				return err
 			}
 			manifest.Layers = append(manifest.Layers, addonLayer...)
-			cfg.Config.Labels = make(map[string]string)
-			cfg.Config.Labels["test"] = "we can write workspace image ref and size here"
+			if manifest.Annotations == nil {
+				manifest.Annotations = make(map[string]string)
+			}
+			manifest.Annotations["io.gitpod.workspace-image.size"] = strconv.Itoa(originImageSize)
+			manifest.Annotations["io.gitpod.workspace-image.ref"] = mh.Spec.BaseRef
 
 			// place config in store
 			rawCfg, err := json.Marshal(cfg)

components/ws-daemon/go.mod

@@ -82,6 +82,7 @@ require (
 	github.com/containerd/continuity v0.4.2 // indirect
 	github.com/containerd/fifo v1.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/containerd/ttrpc v1.2.2 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
@@ -144,7 +145,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/opencontainers/selinux v1.11.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

components/ws-daemon/go.sum

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -20,6 +21,8 @@ import (
 	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
+	"github.com/containerd/containerd/images"
+	"github.com/containerd/platforms"
 	"github.com/containerd/typeurl/v2"
 	ocispecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opentracing/opentracing-go"
@@ -502,13 +505,18 @@ func (s *Containerd) GetContainerImageInfo(ctx context.Context, id ID) (*workspa
 		TotalSize: size,
 	}
 
-	sp, err := image.Spec(ctx)
+	// Fetch the manifest
+	manifest, err := images.Manifest(ctx, s.Client.ContentStore(), image.Target(), platforms.Default())
 	if err != nil {
-		log.WithError(err).Error("cannot get image spec")
-	} else {
-		log.WithField("labels", log.TrustedValueWrap{Value: sp.Config.Labels}).Info("image spec ---------- ")
+		log.WithError(err).WithField("image", info.ImageRef).Error("Failed to get manifest")
+		return wsImageInfo, nil
+	}
+	if manifest.Annotations != nil {
+		wsImageInfo.WorkspaceImageRef = manifest.Annotations["io.gitpod.workspace-image.ref"]
+		if size, err := strconv.Atoi(manifest.Annotations["io.gitpod.workspace-image.size"]); err == nil {
+			wsImageInfo.WorkspaceImageSize = int64(size)
+		}
 	}
-
 	return wsImageInfo, nil
 }
 

components/ws-daemon/pkg/container/containerd.go

@@ -230,7 +230,6 @@ func (wsc *WorkspaceController) handleWorkspaceRunning(ctx context.Context, ws *
 		if err != nil {
 			return ctrl.Result{}, fmt.Errorf("failed to get container image info: %w", err)
 		}
-		glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).WithField("info", glog.TrustedValueWrap{Value: info}).WithField("phase", ws.Status.Phase).Info("handle workspace running ===============")
 
 		err = retry.RetryOnConflict(retryParams, func() error {
 			if err := wsc.Get(ctx, req.NamespacedName, ws); err != nil {

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

@@ -173,14 +173,10 @@ type WorkspaceImageInfo struct {
 	TotalSize int64 `json:"totalSize"`
 
 	// +kubebuilder:validation:Optional
-	Details []ImageInfo `json:"details"`
-}
+	WorkspaceImageSize int64 `json:"workspaceImageSize,omitempty"`
 
-type ImageInfo struct {
-	// +kubebuilder:validation:Required
-	Size int64 `json:"size"`
-	// +kubebuilder:validation:Required
-	Ref string `json:"ref"`
+	// +kubebuilder:validation:Optional
+	WorkspaceImageRef string `json:"workspaceImageRef,omitempty"`
 }
 
 // WorkspaceStatus defines the observed state of Workspace

components/ws-manager-api/go/crd/v1/workspace_types.go

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+# Copyright (c) 2023 Gitpod GmbH. All rights reserved.
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 

components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+# Copyright (c) 2023 Gitpod GmbH. All rights reserved.
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
@@ -520,22 +520,14 @@ spec:
                 type: object
               imageInfo:
                 properties:
-                  details:
-                    items:
-                      properties:
-                        ref:
-                          type: string
-                        size:
-                          format: int64
-                          type: integer
-                      required:
-                      - ref
-                      - size
-                      type: object
-                    type: array
                   totalSize:
                     format: int64
                     type: integer
+                  workspaceImageRef:
+                    type: string
+                  workspaceImageSize:
+                    format: int64
+                    type: integer
                 required:
                 - totalSize
                 type: object

components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_snapshots.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+# Copyright (c) 2023 Gitpod GmbH. All rights reserved.
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.