From 0ad5dff3b8c054e2014f10825c5b12a8989eeef2 Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Mon, 25 Sep 2023 23:14:20 +0800 Subject: [PATCH] runtime: merge metadata and annotation in imagepullvolume merge metadata and annotation in imagepullvolume Fixes #8060 Signed-off-by: ChengyuZhu6 --- src/runtime/virtcontainers/kata_agent.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go index bcf47c65a3..eb74cd2994 100644 --- a/src/runtime/virtcontainers/kata_agent.go +++ b/src/runtime/virtcontainers/kata_agent.go @@ -1589,7 +1589,11 @@ func handleImageGuestPullBlockVolume(c *Container, virtualVolumeInfo *types.Kata } } virtualVolumeInfo.Source = image_ref - virtualVolumeInfo.ImagePull.Metadata = container_annotations + + //merge virtualVolumeInfo.ImagePull.Metadata and container_annotations + for k, v := range container_annotations { + virtualVolumeInfo.ImagePull.Metadata[k] = v + } } no, err := json.Marshal(virtualVolumeInfo.ImagePull)