From 52f7d9d9f2bed0e2eac7aa051a91eb6f8cd8fa34 Mon Sep 17 00:00:00 2001 From: roman-kiselenko Date: Mon, 4 Dec 2023 19:48:04 +0300 Subject: [PATCH] node-image: add label pinned at the import action Signed-off-by: roman-kiselenko --- pkg/build/nodeimage/buildcontext.go | 2 +- pkg/build/nodeimage/imageimporter.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/build/nodeimage/buildcontext.go b/pkg/build/nodeimage/buildcontext.go index fed540dcf0..b9fd2379f0 100644 --- a/pkg/build/nodeimage/buildcontext.go +++ b/pkg/build/nodeimage/buildcontext.go @@ -286,7 +286,7 @@ func (c *buildContext) prePullImagesAndWriteManifests(bits kube.Bits, parsedVers return err } defer f.Close() - //return importer.LoadCommand().SetStdout(os.Stdout).SetStderr(os.Stderr).SetStdin(f).Run() + // return importer.LoadCommand().SetStdout(os.Stdout).SetStderr(os.Stderr).SetStdin(f).Run() // we will rewrite / correct the tags as we load the image if err := exec.RunWithStdinWriter(importer.LoadCommand().SetStdout(os.Stdout).SetStderr(os.Stdout), func(w io.Writer) error { return docker.EditArchive(f, w, fixRepository, c.arch) diff --git a/pkg/build/nodeimage/imageimporter.go b/pkg/build/nodeimage/imageimporter.go index d9e558cc65..2894f57d1d 100644 --- a/pkg/build/nodeimage/imageimporter.go +++ b/pkg/build/nodeimage/imageimporter.go @@ -55,7 +55,7 @@ func (c *containerdImporter) Pull(image, platform string) error { func (c *containerdImporter) LoadCommand() exec.Cmd { return c.containerCmder.Command( // TODO: ideally we do not need this in the future. we have fixed at least one image - "ctr", "--namespace=k8s.io", "images", "import", "--all-platforms", "--no-unpack", "--digests", "-", + "ctr", "--namespace=k8s.io", "images", "import", "--label=io.cri-containerd.pinned=pinned", "--all-platforms", "--no-unpack", "--digests", "-", ) }