add label flags to ctr import

Signed-off-by: roman-kiselenko <shindu666@gmail.com>

client/import.go

@@ -37,6 +37,7 @@ type importOpts struct {
 	platformMatcher platforms.MatchComparer
 	compress        bool
 	discardLayers   bool
+	imageLabels     map[string]string
 }
 
 // ImportOpt allows the caller to specify import specific options
@@ -51,6 +52,14 @@ func WithImageRefTranslator(f func(string) string) ImportOpt {
 	}
 }
 
+// WithImageLabels are the image labels to apply to a new image
+func WithImageLabels(labels map[string]string) ImportOpt {
+	return func(c *importOpts) error {
+		c.imageLabels = labels
+		return nil
+	}
+}
+
 // WithDigestRef is used to create digest images for each
 // manifest in the index.
 func WithDigestRef(f func(digest.Digest) string) ImportOpt {
@@ -208,6 +217,7 @@ func (c *Client) Import(ctx context.Context, reader io.Reader, opts ...ImportOpt
 	}
 
 	for i := range imgs {
+		setImageLabels(&imgs[i], iopts.imageLabels)
 		img, err := is.Update(ctx, imgs[i], "target")
 		if err != nil {
 			if !errdefs.IsNotFound(err) {
@@ -225,6 +235,11 @@ func (c *Client) Import(ctx context.Context, reader io.Reader, opts ...ImportOpt
 	return imgs, nil
 }
 
+func setImageLabels(i *images.Image, labels map[string]string) {
+	i.Labels = map[string]string{}
+	i.Labels = labels
+}
+
 func imageName(annotations map[string]string, ociCleanup func(string) string) string {
 	name := annotations[images.AnnotationImageName]
 	if name != "" {

cmd/ctr/commands/images/import.go

@@ -98,7 +98,7 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
 			Name:  "discard-unpacked-layers",
 			Usage: "Allow the garbage collector to clean layers up from the content store after unpacking, cannot be used with --no-unpack, false by default",
 		},
-	}, commands.SnapshotterFlags...),
+	}, append(commands.SnapshotterFlags, commands.LabelFlag)...),
 
 	Action: func(context *cli.Context) error {
 		var (
@@ -123,6 +123,11 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
 				overwrite = true
 			}
 
+			labels := context.StringSlice("label")
+			if len(labels) > 0 {
+				opts = append(opts, image.WithImageLabels(commands.LabelArgs(labels)))
+			}
+
 			if context.Bool("digests") {
 				opts = append(opts, image.WithDigestRef(prefix, overwrite, !context.Bool("skip-digest-for-named")))
 			} else {
@@ -237,6 +242,11 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
 			opts = append(opts, containerd.WithDiscardUnpackedLayers())
 		}
 
+		labels := context.StringSlice("label")
+		if len(labels) > 0 {
+			opts = append(opts, containerd.WithImageLabels(commands.LabelArgs(labels)))
+		}
+
 		ctx, done, err := client.WithLease(ctx)
 		if err != nil {
 			return err