From 86c692411913e87d88039ff87f9fd095aa94d152 Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Tue, 2 Nov 2021 18:58:36 -0700 Subject: [PATCH] containerd: v1.5.7-k3s2 (#4387) Signed-off-by: Jacob Blain Christen --- go.mod | 2 +- go.sum | 4 ++-- .../containerd/pkg/cri/opts/spec_linux.go | 24 ------------------- .../pkg/cri/server/container_create_linux.go | 2 +- vendor/modules.txt | 4 ++-- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index af358bc24c..b89ca3f43d 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ replace ( github.com/containerd/btrfs => github.com/containerd/btrfs v1.0.0 github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1 github.com/containerd/console => github.com/containerd/console v1.0.2 - github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.7-k3s1 // k3s-release/1.5 + github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.7-k3s2 // k3s-release/1.5 github.com/containerd/continuity => github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1 github.com/containerd/fifo => github.com/containerd/fifo v1.0.0 github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0 diff --git a/go.sum b/go.sum index 113e359bf4..5f6812ed04 100644 --- a/go.sum +++ b/go.sum @@ -556,8 +556,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k3s-io/containerd v1.5.7-k3s1 h1:zL6q83W5GjsOTDaTnulq7s4pxw3/7bts5crf69QkGbk= -github.com/k3s-io/containerd v1.5.7-k3s1/go.mod h1:hObOmrfY040ivCbFVvVnwQhAfGVTE/6DqD2WHFFmgX8= +github.com/k3s-io/containerd v1.5.7-k3s2 h1:Nbx8V5pW+laFwWailSJSlL/hkeITu4eyP4aINHk/Llg= +github.com/k3s-io/containerd v1.5.7-k3s2/go.mod h1:hObOmrfY040ivCbFVvVnwQhAfGVTE/6DqD2WHFFmgX8= github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1 h1:KEz2rd9IDbrQT8w6RibEYlwfTXiu0P6hQDE+6O4IJdI= github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/k3s-io/cri-tools v1.21.0-k3s1 h1:MWQtAsx4HCNXenqU/B4V9eU6HMyafkd1PnW6d4HCfos= diff --git a/vendor/github.com/containerd/containerd/pkg/cri/opts/spec_linux.go b/vendor/github.com/containerd/containerd/pkg/cri/opts/spec_linux.go index c5ec3dfdd2..84c16b6f84 100644 --- a/vendor/github.com/containerd/containerd/pkg/cri/opts/spec_linux.go +++ b/vendor/github.com/containerd/containerd/pkg/cri/opts/spec_linux.go @@ -225,30 +225,6 @@ func WithMounts(osi osinterface.OS, config *runtime.ContainerConfig, extra []*ru } } -const ( - etcHosts = "/etc/hosts" - etcHostname = "/etc/hostname" - resolvConfPath = "/etc/resolv.conf" -) - -// WithRelabeledContainerMounts relabels the default container mounts for files in /etc -func WithRelabeledContainerMounts(mountLabel string) oci.SpecOpts { - return func(ctx context.Context, client oci.Client, _ *containers.Container, s *runtimespec.Spec) (err error) { - if mountLabel == "" { - return nil - } - for _, m := range s.Mounts { - switch m.Destination { - case etcHosts, etcHostname, resolvConfPath: - if err := label.Relabel(m.Source, mountLabel, false); err != nil { - return err - } - } - } - return nil - } -} - // Ensure mount point on which path is mounted, is shared. func ensureShared(path string, lookupMount func(string) (mount.Info, error)) error { mountInfo, err := lookupMount(path) diff --git a/vendor/github.com/containerd/containerd/pkg/cri/server/container_create_linux.go b/vendor/github.com/containerd/containerd/pkg/cri/server/container_create_linux.go index 1ad2947b8f..30989af882 100644 --- a/vendor/github.com/containerd/containerd/pkg/cri/server/container_create_linux.go +++ b/vendor/github.com/containerd/containerd/pkg/cri/server/container_create_linux.go @@ -192,7 +192,7 @@ func (c *criService) containerSpec( } }() - specOpts = append(specOpts, customopts.WithMounts(c.os, config, extraMounts, mountLabel), customopts.WithRelabeledContainerMounts(mountLabel)) + specOpts = append(specOpts, customopts.WithMounts(c.os, config, extraMounts, mountLabel)) if !c.config.DisableProcMount { // Change the default masked/readonly paths to empty slices diff --git a/vendor/modules.txt b/vendor/modules.txt index c382c584ef..a8a6e51058 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -184,7 +184,7 @@ github.com/containerd/cgroups/v2 github.com/containerd/cgroups/v2/stats # github.com/containerd/console v1.0.3 => github.com/containerd/console v1.0.2 github.com/containerd/console -# github.com/containerd/containerd v1.5.7 => github.com/k3s-io/containerd v1.5.7-k3s1 +# github.com/containerd/containerd v1.5.7 => github.com/k3s-io/containerd v1.5.7-k3s2 ## explicit github.com/containerd/containerd github.com/containerd/containerd/api/events @@ -3393,7 +3393,7 @@ sigs.k8s.io/yaml # github.com/containerd/btrfs => github.com/containerd/btrfs v1.0.0 # github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1 # github.com/containerd/console => github.com/containerd/console v1.0.2 -# github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.7-k3s1 +# github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.7-k3s2 # github.com/containerd/continuity => github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1 # github.com/containerd/fifo => github.com/containerd/fifo v1.0.0 # github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0