diff --git a/Dockerfile b/Dockerfile index 02106e7015..cd4e4cbd45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -126,7 +126,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host FROM rancher/hardened-kubernetes:v1.26.11-rke2r1-build20231115 AS kubernetes -FROM rancher/hardened-containerd:v1.7.10-k3s1-build20231208 AS containerd +FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc diff --git a/Dockerfile.windows b/Dockerfile.windows index 7adbb7dc79..5d77d1c100 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins WORKDIR /source # End Dapper stuff -FROM rancher/hardened-containerd:v1.7.10-k3s1-build20231208-amd64-windows AS containerd +FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211-amd64-windows AS containerd FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev diff --git a/go.mod b/go.mod index 633cabd7d9..4334f87906 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace ( github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.4-k3s1 github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.0.1-0.20230508174102-b42e5faded1c - github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.10-k3s1.26 + github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.11-k3s2.26 github.com/containerd/stargz-snapshotter => github.com/k3s-io/stargz-snapshotter v0.14.3-k3s1 github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible github.com/docker/docker => github.com/docker/docker v24.0.0-rc.2.0.20230801142700-69c9adb7d386+incompatible diff --git a/go.sum b/go.sum index 1df117e626..760f4b54d4 100644 --- a/go.sum +++ b/go.sum @@ -900,8 +900,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= 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/k3s-io/containerd v1.7.10-k3s1.26 h1:zhZWaFrm0ZpQsEbSjRd290wICGf6pa9hnJmVipg8Dyk= -github.com/k3s-io/containerd v1.7.10-k3s1.26/go.mod h1:dLQbKVd9nQsB+/2LO09B/VMzHELxgeORT5OCucwBMVo= +github.com/k3s-io/containerd v1.7.11-k3s2.26 h1:L+qoTJbpm7g3lse9BzhN23neHsee74XjQwo4m7tvljA= +github.com/k3s-io/containerd v1.7.11-k3s2.26/go.mod h1:dLQbKVd9nQsB+/2LO09B/VMzHELxgeORT5OCucwBMVo= github.com/k3s-io/cri-dockerd v0.3.4-k3s1 h1:eCeVCeXzf10fyanv1gniSwidBjdO83/akv+M72uEnZc= github.com/k3s-io/cri-dockerd v0.3.4-k3s1/go.mod h1:0KDOU8lLjp+ETJFFCcVBRQbJ8puRoDxaHBDj8C87Fk4= github.com/k3s-io/etcd/api/v3 v3.5.9-k3s1 h1:y4ont0HdnS7gtWNTXM8gahpKjAHtctgON/sjVRthlZY=