From 2c835b60ed53f0c1a3db135fc41f0e69d8464733 Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Wed, 7 Jul 2021 15:22:55 +0800 Subject: [PATCH] ContainerConfig: Set ocispec.Annotations to containerConfig.Annotations ocispec.Annotations is dropped in ContainerConfig. This commit let it to be set to containerConfig.Annotations in ContainerConfig. Fixes: #2201 Signed-off-by: Hui Zhu --- src/runtime/virtcontainers/pkg/oci/utils.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/runtime/virtcontainers/pkg/oci/utils.go b/src/runtime/virtcontainers/pkg/oci/utils.go index 9eecd02b4..1240b9bb0 100644 --- a/src/runtime/virtcontainers/pkg/oci/utils.go +++ b/src/runtime/virtcontainers/pkg/oci/utils.go @@ -950,17 +950,22 @@ func ContainerConfig(ocispec specs.Spec, bundlePath, cid, console string, detach RootFs: rootfs, ReadonlyRootfs: ocispec.Root.Readonly, Cmd: cmd, - Annotations: map[string]string{ - vcAnnotations.BundlePathKey: bundlePath, - }, - Mounts: containerMounts(ocispec), - DeviceInfos: deviceInfos, - Resources: *ocispec.Linux.Resources, + Annotations: ocispec.Annotations, + Mounts: containerMounts(ocispec), + DeviceInfos: deviceInfos, + Resources: *ocispec.Linux.Resources, // This is a custom OCI spec modified at SetEphemeralStorageType() // to support ephemeral storage and k8s empty dir. CustomSpec: &ocispec, } + if containerConfig.Annotations == nil { + containerConfig.Annotations = map[string]string{ + vcAnnotations.BundlePathKey: bundlePath, + } + } else { + containerConfig.Annotations[vcAnnotations.BundlePathKey] = bundlePath + } cType, err := ContainerType(ocispec) if err != nil {