Merge pull request #4635 from dcantah/fixup-snapshotteropts

mxpv · web-flow · commit 88f089354009 · 2020-10-15T12:09:34.000-07:00
Filter snapshotter labels passed to wrapper of WithNewSnapshot
diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go
@@ -181,7 +181,7 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 
 	log.G(ctx).Debugf("Container %q spec: %#+v", id, spew.NewFormatter(spec))
 
-	snapshotterOpt := snapshots.WithLabels(config.Annotations)
+	snapshotterOpt := snapshots.WithLabels(snapshots.FilterInheritedLabels(config.Annotations))
 	// Set snapshotter before any other options.
 	opts := []containerd.NewContainerOpts{
 		containerd.WithSnapshotter(c.config.ContainerdConfig.Snapshotter),
diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go
@@ -192,7 +192,7 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
 		return nil, errors.Wrap(err, "failed to generate runtime options")
 	}
 
-	snapshotterOpt := snapshots.WithLabels(config.Annotations)
+	snapshotterOpt := snapshots.WithLabels(snapshots.FilterInheritedLabels(config.Annotations))
 	opts := []containerd.NewContainerOpts{
 		containerd.WithSnapshotter(c.config.ContainerdConfig.Snapshotter),
 		customopts.WithNewSnapshot(id, containerdImage, snapshotterOpt),

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func (c criService) RunPodSandbox(ctx context.Context, r runtime.RunPodSandbox`
`192`	`192`	`return nil, errors.Wrap(err, "failed to generate runtime options")`
`193`	`193`	`}`
`194`	`194`
`195`		`- snapshotterOpt := snapshots.WithLabels(config.Annotations)`
	`195`	`+ snapshotterOpt := snapshots.WithLabels(snapshots.FilterInheritedLabels(config.Annotations))`
`196`	`196`	`opts := []containerd.NewContainerOpts{`
`197`	`197`	`containerd.WithSnapshotter(c.config.ContainerdConfig.Snapshotter),`
`198`	`198`	`customopts.WithNewSnapshot(id, containerdImage, snapshotterOpt),`