From 0ecefa739ffa60854685bb5dd82cfd4c475a9043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Rop=C3=A9?= Date: Mon, 22 Aug 2022 13:49:25 +0200 Subject: [PATCH] Adding annotations for image and sandbox name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These annotations are present for the container, but not the sandbox. They are required for peer-pods VMs, used to identify the right image to use. Signed-off-by: Julien Ropé --- server/sandbox_run_linux.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sandbox_run_linux.go b/server/sandbox_run_linux.go index aa51ac53a19..b2e04b9b95c 100644 --- a/server/sandbox_run_linux.go +++ b/server/sandbox_run_linux.go @@ -603,10 +603,12 @@ func (s *Server) runPodSandbox(ctx context.Context, req *types.RunPodSandboxRequ g.AddAnnotation(annotations.Annotations, string(kubeAnnotationsJSON)) g.AddAnnotation(annotations.LogPath, logPath) g.AddAnnotation(annotations.Name, sbox.Name()) + g.AddAnnotation(annotations.SandboxName, sbox.Name()) g.AddAnnotation(annotations.Namespace, namespace) g.AddAnnotation(annotations.ContainerType, annotations.ContainerTypeSandbox) g.AddAnnotation(annotations.SandboxID, sbox.ID()) g.AddAnnotation(annotations.Image, s.config.PauseImage) + g.AddAnnotation(annotations.ImageName, s.config.PauseImage) g.AddAnnotation(annotations.ContainerName, containerName) g.AddAnnotation(annotations.ContainerID, sbox.ID()) g.AddAnnotation(annotations.ShmPath, shmPath)