packages: bump containerd to 1.2.13

CHANGELOG.md

@@ -4,3 +4,4 @@
 
 ### Features Added
 - Upgrade Calico to 3.12.0 (PR [#2253](https://github.com/scality/metalk8s/pull/2253))
+- Upgrade `containerd` to 1.2.13 (PR [#2369](https://github.com/scality/metalk8s/pull/2369))

buildchain/buildchain/versions.py

@@ -20,7 +20,7 @@
 CALICO_VERSION     : str = '3.12.0'
 K8S_VERSION        : str = '1.17.4'
 SALT_VERSION       : str = '2018.3.4'
-CONTAINERD_VERSION : str = '1.2.4'
+CONTAINERD_VERSION : str = '1.2.13'
 
 def load_version_information() -> None:
     """Load version information from `VERSION`."""

packages/redhat/containerd.spec

@@ -1,5 +1,5 @@
 %global goipath github.com/containerd/containerd
-Version:        1.2.4
+Version:        1.2.13
 
 %if %{defined fedora}
 %gometa
@@ -54,21 +54,21 @@ Provides:       bundled(golang(github.com/blang/semver)) = v3.1.0
 Provides:       bundled(golang(github.com/BurntSushi/toml)) = a368813c5e648fee92e5f6c30e3944ff9d5e8895
 Provides:       bundled(golang(github.com/containerd/aufs)) = ffa39970e26ad01d81f540b21e65f9c1841a5f92
 Provides:       bundled(golang(github.com/containerd/btrfs)) = 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
-Provides:       bundled(golang(github.com/containerd/cgroups)) = 5e610833b72089b37d0e615de9a92dfc043757c2
+Provides:       bundled(golang(github.com/containerd/cgroups)) = c4b9ac5c7601384c965b9646fc515884e091ebb9
 Provides:       bundled(golang(github.com/containerd/console)) = c12b1e7919c14469339a5d38f2f8ed9b64a9de23
 Provides:       bundled(golang(github.com/containerd/continuity)) = bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
-Provides:       bundled(golang(github.com/containerd/cri)) = 0ca1e3c2b73b5c38e72f29bb76338d0078b23d6c
+Provides:       bundled(golang(github.com/containerd/cri)) = b1052f3b73fb9f0a6805d3c20e884a4cef265a38
 Provides:       bundled(golang(github.com/containerd/fifo)) = 3d5202aec260678c48179c56f40e6f38a095738c
 Provides:       bundled(golang(github.com/containerd/go-cni)) = 40bcf8ec8acd7372be1d77031d585d5d8e561c90
-Provides:       bundled(golang(github.com/containerd/go-runc)) = 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
-Provides:       bundled(golang(github.com/containerd/ttrpc)) = 2a805f71863501300ae1976d29f0454ae003e85a
+Provides:       bundled(golang(github.com/containerd/go-runc)) = e029b79d8cda8374981c64eba71f28ec38e5526f
+Provides:       bundled(golang(github.com/containerd/ttrpc)) = 92c8520ef9f86600c650dd540266a007bf03670f
 Provides:       bundled(golang(github.com/containerd/typeurl)) = a93fcdb778cd272c6e9b3028b2f42d813e785d40
-Provides:       bundled(golang(github.com/containerd/zfs)) = 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec
+Provides:       bundled(golang(github.com/containerd/zfs)) = 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
 Provides:       bundled(golang(github.com/containernetworking/cni)) = v0.6.0
-Provides:       bundled(golang(github.com/containernetworking/plugins)) = v0.7.0
+Provides:       bundled(golang(github.com/containernetworking/plugins)) = v0.7.5
 Provides:       bundled(golang(github.com/coreos/go-systemd)) = 48702e0da86bd25e76cfef347e2adeb434a0d0a6
 Provides:       bundled(golang(github.com/davecgh/go-spew)) = v1.1.0
-Provides:       bundled(golang(github.com/docker/distribution)) = b38e5838b7b2f2ad48e06ec4b500011976080621
+Provides:       bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580
 Provides:       bundled(golang(github.com/docker/docker)) = 86f080cff0914e9694068ed78d503701667c4c00
 Provides:       bundled(golang(github.com/docker/go-events)) = 9461782956ad83b30282bf90e31fa6a70c255ba9
 Provides:       bundled(golang(github.com/docker/go-metrics)) = 4ea375f7759c82740c893fc030bc37088d2ec098
@@ -83,29 +83,29 @@ Provides:       bundled(golang(github.com/golang/glog)) = 44145f04b68cf362d9c4df
 Provides:       bundled(golang(github.com/golang/protobuf)) = v1.1.0
 Provides:       bundled(golang(github.com/google/go-cmp)) = v0.1.0
 Provides:       bundled(golang(github.com/google/gofuzz)) = 44d81051d367757e1c7c6a5a86423ece9afcf63c
+Provides:       bundled(golang(github.com/google/uuid)) = v1.1.1
 Provides:       bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
 Provides:       bundled(golang(github.com/hashicorp/errwrap)) = 7554cd9344cec97297fa6649b055a8c98c2a1e55
 Provides:       bundled(golang(github.com/hashicorp/go-multierror)) = ed905158d87462226a13fe39ddf685ea65f1c11f
 Provides:       bundled(golang(github.com/json-iterator/go)) = 1.1.5
 Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.0
 Provides:       bundled(golang(github.com/Microsoft/go-winio)) = v0.4.11
 Provides:       bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.1
-Provides:       bundled(golang(github.com/mistifyio/go-zfs)) = 166add352731e515512690329794ee593f1aaff2
+Provides:       bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb
 Provides:       bundled(golang(github.com/modern-go/concurrent)) = 1.0.3
 Provides:       bundled(golang(github.com/modern-go/reflect2)) = 1.0.1
 Provides:       bundled(golang(github.com/opencontainers/go-digest)) = c9281466c8b2f606084ac71339773efd177436e7
 Provides:       bundled(golang(github.com/opencontainers/image-spec)) = v1.0.1
-Provides:       bundled(golang(github.com/opencontainers/runc)) = 96ec2177ae841256168fcf76954f7177af9446eb
+Provides:       bundled(golang(github.com/opencontainers/runc)) = dc9208a3303feef5b3839f4323d9beb36df0a9dd
 Provides:       bundled(golang(github.com/opencontainers/runtime-spec)) = eba862dc2470385a233c7507392675cbeadf7353
 Provides:       bundled(golang(github.com/opencontainers/runtime-tools)) = v0.6.0
-Provides:       bundled(golang(github.com/opencontainers/selinux)) = b6fa367ed7f534f9ba25391cc2d467085dbb445a
-Provides:       bundled(golang(github.com/pborman/uuid)) = c65b2f87fee37d1c7854c9164a450713c28d50cd
+Provides:       bundled(golang(github.com/opencontainers/selinux)) = 5215b1806f52b1fcc2070a8826c542c9d33cd3cf
 Provides:       bundled(golang(github.com/pkg/errors)) = v0.8.0
 Provides:       bundled(golang(github.com/prometheus/client_golang)) = f4fb1b73fb099f396a7f0036bf86aa8def4ed823
 Provides:       bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
 Provides:       bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563
 Provides:       bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd
-Provides:       bundled(golang(github.com/seccomp/libseccomp-golang)) = 32f571b70023028bd57d9288c20efbcb237f3ce0
+Provides:       bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.1
 Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.0.0
 Provides:       bundled(golang(github.com/syndtr/gocapability)) = db04d3cc01c8b54962a58ec7e491717d06cfcc16
 Provides:       bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
@@ -114,17 +114,18 @@ Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac2762d5f
 Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b
 Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 1d523034197ff1f222f6429836dd36a2457a1874
 Provides:       bundled(golang(go.etcd.io/bbolt)) = v1.3.1-etcd.8
-Provides:       bundled(golang(golang.org/x/crypto)) = 49796115aa4b964c318aad4f3084fdb41e9aa067
+Provides:       bundled(golang(golang.org/x/crypto)) = 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
 Provides:       bundled(golang(golang.org/x/net)) = b3756b4b77d7b13260a0a2ec658753cf48922eac
 Provides:       bundled(golang(golang.org/x/oauth2)) = a6bd8cefa1811bd24b86f8902872e4e8225f74c4
 Provides:       bundled(golang(golang.org/x/sync)) = 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
-Provides:       bundled(golang(golang.org/x/sys)) = 1b2967e3c290b7c545b3db0deeda16e9be4f98a2
+Provides:       bundled(golang(golang.org/x/sys)) = 41f3e6584952bb034a481797859f6ab34b6803bd
 Provides:       bundled(golang(golang.org/x/text)) = 19e51611da83d6be54ddafce4a4af510cb3e9ea4
 Provides:       bundled(golang(golang.org/x/time)) = f51c12702a4d776e4c1fa9b0fabab841babae631
+Provides:       bundled(golang(google.golang.org/appengine)) = 54a98f90d1c46b7731eb8fb305d2a321c30ef610
 Provides:       bundled(golang(google.golang.org/genproto)) = d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
-Provides:       bundled(golang(google.golang.org/grpc)) = v1.12.0
+Provides:       bundled(golang(google.golang.org/grpc)) = 39e8a7b072a67ca2a75f57fa2e0d50995f5b22f6
 Provides:       bundled(golang(gopkg.in/inf.v0)) = 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-Provides:       bundled(golang(gopkg.in/yaml.v2)) = v2.2.1
+Provides:       bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48
 Provides:       bundled(golang(gotest.tools)) = v2.1.0
 Provides:       bundled(golang(k8s.io/api)) = kubernetes-1.12.0
 Provides:       bundled(golang(k8s.io/apimachinery)) = kubernetes-1.12.0
@@ -151,6 +152,7 @@ low-level storage and network attachments, etc.
 export LDFLAGS="-X %{goipath}/version.Version=%{version}"
 %gobuild -o _bin/containerd %{goipath}/cmd/containerd
 %gobuild -o _bin/containerd-shim %{goipath}/cmd/containerd-shim
+%gobuild -o _bin/containerd-shim-runc-v1 %{goipath}/cmd/containerd-shim-runc-v1
 %gobuild -o _bin/ctr %{goipath}/cmd/ctr
 mkdir _man
 go-md2man -in docs/man/containerd.1.md -out _man/containerd.1
@@ -162,6 +164,7 @@ go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.t
 %install
 install -D -p -m 0755 _bin/containerd %{buildroot}%{_bindir}/containerd
 install -D -p -m 0755 _bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim
+install -D -p -m 0755 _bin/containerd-shim-runc-v1 %{buildroot}%{_bindir}/containerd-shim-runc-v1
 install -D -p -m 0755 _bin/ctr %{buildroot}%{_bindir}/ctr
 install -D -p -m 0644 _man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1
 install -D -p -m 0644 _man/containerd-config.1 %{buildroot}%{_mandir}/man1/containerd-config.1
@@ -194,6 +197,7 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %doc README.md
 %{_bindir}/containerd
 %{_bindir}/containerd-shim
+%{_bindir}/containerd-shim-runc-v1
 %{_bindir}/ctr
 %{_mandir}/man1/containerd.1*
 %{_mandir}/man1/containerd-config.1*
@@ -205,6 +209,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 
 
 %changelog
+* Mon Apr 6 2020 Nicolas Trangez <[email protected]> - 1.2.13-1
+- Latest upstream
+
 * Tue Feb 26 2019 Carl George <[email protected]> - 1.2.4-1
 - Latest upstream