[feat.] image config field imageRef and 'podSandboxMeta'

Signed-off-by: zhuangbowei.zbw <zhuangbowei.zbw@alibaba-inc.com>

Author: WaberZhuang

.github/workflows/release.yml

@@ -33,6 +33,7 @@ jobs:
     - name: Build
       shell: bash
       run: |
+        set -x
         RELEASE_VERSION=${{ env.RELEASE_VERSION }}
         if [[ -z ${RELEASE_VERSION} ]]; then
           git fetch --tags

pkg/snapshot/overlay.go

@@ -1504,6 +1504,10 @@ func (o *snapshotter) turboOCIFsMeta(id string) (string, string) {
 				log.L.Warn("erofs is not supported on this system, fallback to other fs type")
 				continue
 			}
+			if fsType == "erofs" && o.rwMode != RoDir {
+				log.L.Warn("erofs is not supported in rw mode, fallback to other fs type")
+				continue
+			}
 			return fsmeta, fsType
 		} else if !errors.Is(err, os.ErrNotExist) {
 			log.L.Errorf("error while checking fs meta file: %s", err)

pkg/snapshot/storage.go

@@ -498,6 +498,19 @@ func (o *snapshotter) constructOverlayBDSpec(ctx context.Context, key string, wr
 		ResultFile: o.overlaybdInitDebuglogPath(id),
 	}
 
+	if writable {
+		// pod sandbox meta is only for rw layer
+		meta, ok := info.Labels["PodSandboxMetadata"]
+		if !ok {
+			log.G(ctx).Warn("no pod sandbox meta found")
+		} else {
+			if err := json.Unmarshal([]byte(meta), &configJSON.PodSandboxMeta); err != nil {
+				return fmt.Errorf("failed to unmarshal pod sandbox meta %q: %w", meta, err)
+			}
+			log.G(ctx).Infof("pod sandbox meta: %s", meta)
+		}
+	}
+
 	// load the parent's config and reuse the lowerdir
 	if info.Parent != "" {
 		parentID, _, _, err := storage.GetInfo(ctx, info.Parent)
@@ -511,6 +524,7 @@ func (o *snapshotter) constructOverlayBDSpec(ctx context.Context, key string, wr
 		}
 		configJSON.RepoBlobURL = parentConfJSON.RepoBlobURL
 		configJSON.Lowers = parentConfJSON.Lowers
+		configJSON.ImageRef = parentConfJSON.ImageRef
 	}
 
 	switch stype {
@@ -540,6 +554,7 @@ func (o *snapshotter) constructOverlayBDSpec(ctx context.Context, key string, wr
 		}
 
 		configJSON.RepoBlobURL = blobPrefixURL
+		configJSON.ImageRef = ref
 		if isTurboOCI, dataDgst, compType := o.checkTurboOCI(info.Labels); isTurboOCI {
 			var fsmeta string
 

pkg/types/types.go

@@ -18,12 +18,14 @@ package types
 
 // OverlayBDBSConfig is the config of overlaybd target.
 type OverlayBDBSConfig struct {
+	ImageRef          string                   `json:"imageRef"`
 	RepoBlobURL       string                   `json:"repoBlobUrl"`
 	Lowers            []OverlayBDBSConfigLower `json:"lowers"`
 	Upper             OverlayBDBSConfigUpper   `json:"upper"`
 	ResultFile        string                   `json:"resultFile"`
 	AccelerationLayer bool                     `json:"accelerationLayer,omitempty"`
 	RecordTracePath   string                   `json:"recordTracePath,omitempty"`
+	PodSandboxMeta    PodSandboxMetadata       `json:"podSandboxMeta,omitempty"`
 }
 
 // OverlayBDBSConfigLower
@@ -43,3 +45,9 @@ type OverlayBDBSConfigUpper struct {
 	Target    string `json:"target,omitempty"`
 	GzipIndex string `json:"gzipIndex,omitempty"`
 }
+
+type PodSandboxMetadata struct {
+	Name      string `json:"name,omitempty"`
+	Uid       string `json:"uid,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
+}