build,packages: Bump containerd to 1.6.31

CHANGELOG.md

@@ -11,6 +11,9 @@
 - Bump etcd version to [3.5.12](https://github.com/etcd-io/etcd/releases/tag/v3.5.12)
   (PR[#4283](https://github.com/scality/metalk8s/pull/4283))
 
+- Bump containerd to [1.6.31](https://github.com/containerd/containerd/releases/tag/v1.6.31)
+  (PR[#4292](https://github.com/scality/metalk8s/pull/4292))
+
 - Bump Calico version to [3.27.3](https://github.com/projectcalico/calico/releases/tag/v3.27.3)
   (PR[#4291](https://github.com/scality/metalk8s/pull/4291))
 

buildchain/buildchain/versions.py

@@ -27,7 +27,7 @@
 
 CALICO_VERSION: str = "3.27.3"
 SALT_VERSION: str = "3002.9"
-CONTAINERD_VERSION: str = "1.6.24"
+CONTAINERD_VERSION: str = "1.6.31"
 
 CONTAINERD_RELEASE: str = "1"
 SOSREPORT_RELEASE: str = "2"

packages/redhat/common/containerd.spec

@@ -1,5 +1,5 @@
 %global goipath github.com/containerd/containerd
-Version:        1.6.24
+Version:        1.6.31
 
 %if %{defined fedora}
 %gometa
@@ -69,10 +69,13 @@ Requires:       (runc < 1:1.1.3 or runc > 1:1.1.3)
 Provides:       bundled(golang(bazil.org/fuse)) = 5883e5a4b512
 Provides:       bundled(golang(cloud.google.com/go)) = v0.81.0
 Provides:       bundled(golang(cloud.google.com/go/bigquery)) = v1.8.0
+Provides:       bundled(golang(cloud.google.com/go/compute)) = v1.23.0
+Provides:       bundled(golang(cloud.google.com/go/compute/metadata)) = v0.2.3
 Provides:       bundled(golang(cloud.google.com/go/datastore)) = v1.1.0
 Provides:       bundled(golang(cloud.google.com/go/firestore)) = v1.1.0
 Provides:       bundled(golang(cloud.google.com/go/pubsub)) = v1.3.1
 Provides:       bundled(golang(cloud.google.com/go/storage)) = v1.10.0
+Provides:       bundled(golang(dario.cat/mergo)) = v1.0.0
 Provides:       bundled(golang(dmitri.shuralyov.com/gpu/mtl)) = 666a987793e9
 Provides:       bundled(golang(github.com/AdaLogics/go-fuzz-headers)) = 6c3934b029d8
 Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go)) = v16.2.1+incompatible
@@ -118,19 +121,19 @@ Provides:       bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd
 Provides:       bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21b
 Provides:       bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0
 Provides:       bundled(golang(github.com/cenkalti/backoff/v4)) = v4.1.2
-Provides:       bundled(golang(github.com/census-instrumentation/opencensus-proto)) = v0.2.1
+Provides:       bundled(golang(github.com/census-instrumentation/opencensus-proto)) = v0.4.1
 Provides:       bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06c6054
 Provides:       bundled(golang(github.com/cespare/xxhash)) = v1.1.0
-Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = v2.1.2
+Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = v2.2.0
 Provides:       bundled(golang(github.com/checkpoint-restore/go-criu/v4)) = v4.1.0
 Provides:       bundled(golang(github.com/checkpoint-restore/go-criu/v5)) = v5.3.0
 Provides:       bundled(golang(github.com/chzyer/logex)) = v1.1.10
 Provides:       bundled(golang(github.com/chzyer/readline)) = 2972be24d48e
 Provides:       bundled(golang(github.com/chzyer/test)) = a1ea475d72b1
 Provides:       bundled(golang(github.com/cilium/ebpf)) = v0.7.0
 Provides:       bundled(golang(github.com/client9/misspell)) = v0.3.4
-Provides:       bundled(golang(github.com/cncf/udpa/go)) = 04548b0d99d4
-Provides:       bundled(golang(github.com/cncf/xds/go)) = cb28da3451f1
+Provides:       bundled(golang(github.com/cncf/udpa/go)) = c52dc94e7fbe
+Provides:       bundled(golang(github.com/cncf/xds/go)) = e9ce68804cb4
 Provides:       bundled(golang(github.com/cockroachdb/datadriven)) = bf6692d28da5
 Provides:       bundled(golang(github.com/cockroachdb/errors)) = v1.2.4
 Provides:       bundled(golang(github.com/cockroachdb/logtags)) = eb05cc24525f
@@ -143,7 +146,8 @@ Provides:       bundled(golang(github.com/containerd/fifo)) = v1.0.0
 Provides:       bundled(golang(github.com/containerd/go-cni)) = v1.1.6
 Provides:       bundled(golang(github.com/containerd/go-runc)) = v1.0.0
 Provides:       bundled(golang(github.com/containerd/imgcrypt)) = v1.1.4
-Provides:       bundled(golang(github.com/containerd/nri)) = v0.1.0
+Provides:       bundled(golang(github.com/containerd/log)) = v0.1.0
+Provides:       bundled(golang(github.com/containerd/nri)) = v0.1.1
 Provides:       bundled(golang(github.com/containerd/stargz-snapshotter/estargz)) = v0.4.1
 Provides:       bundled(golang(github.com/containerd/ttrpc)) = v1.1.2
 Provides:       bundled(golang(github.com/containerd/typeurl)) = v1.0.2
@@ -184,10 +188,10 @@ Provides:       bundled(golang(github.com/docker/spdystream)) = 449fdfce4d96
 Provides:       bundled(golang(github.com/docopt/docopt-go)) = ee0de3bc6815
 Provides:       bundled(golang(github.com/dustin/go-humanize)) = v1.0.0
 Provides:       bundled(golang(github.com/elazarl/goproxy)) = 947c36da3153
-Provides:       bundled(golang(github.com/emicklei/go-restful)) = v2.9.5+incompatible
+Provides:       bundled(golang(github.com/emicklei/go-restful)) = v2.16.0+incompatible
 Provides:       bundled(golang(github.com/emicklei/go-restful/v3)) = v3.10.1
-Provides:       bundled(golang(github.com/envoyproxy/go-control-plane)) = 49ff273808a1
-Provides:       bundled(golang(github.com/envoyproxy/protoc-gen-validate)) = v0.1.0
+Provides:       bundled(golang(github.com/envoyproxy/go-control-plane)) = v0.11.1
+Provides:       bundled(golang(github.com/envoyproxy/protoc-gen-validate)) = v1.0.2
 Provides:       bundled(golang(github.com/evanphx/json-patch)) = v4.11.0+incompatible
 Provides:       bundled(golang(github.com/fatih/color)) = v1.7.0
 Provides:       bundled(golang(github.com/felixge/httpsnoop)) = v1.0.1
@@ -204,7 +208,7 @@ Provides:       bundled(golang(github.com/go-ini/ini)) = v1.25.4
 Provides:       bundled(golang(github.com/go-kit/kit)) = v0.9.0
 Provides:       bundled(golang(github.com/go-kit/log)) = v0.1.0
 Provides:       bundled(golang(github.com/go-logfmt/logfmt)) = v0.5.0
-Provides:       bundled(golang(github.com/go-logr/logr)) = v1.2.2
+Provides:       bundled(golang(github.com/go-logr/logr)) = v1.3.0
 Provides:       bundled(golang(github.com/go-logr/stdr)) = v1.2.2
 Provides:       bundled(golang(github.com/go-openapi/jsonpointer)) = v0.19.5
 Provides:       bundled(golang(github.com/go-openapi/jsonreference)) = v0.19.5
@@ -216,19 +220,19 @@ Provides:       bundled(golang(github.com/godbus/dbus)) = ade71ed3457e
 Provides:       bundled(golang(github.com/godbus/dbus/v5)) = v5.0.6
 Provides:       bundled(golang(github.com/gogo/googleapis)) = v1.4.0
 Provides:       bundled(golang(github.com/gogo/protobuf)) = v1.3.2
-Provides:       bundled(golang(github.com/golang/glog)) = 23def4e6c14b
+Provides:       bundled(golang(github.com/golang/glog)) = v1.1.2
 Provides:       bundled(golang(github.com/golang/groupcache)) = 41bb18bfe9da
 Provides:       bundled(golang(github.com/golang/mock)) = v1.6.0
-Provides:       bundled(golang(github.com/golang/protobuf)) = v1.5.2
+Provides:       bundled(golang(github.com/golang/protobuf)) = v1.5.4
 Provides:       bundled(golang(github.com/google/btree)) = v1.0.1
-Provides:       bundled(golang(github.com/google/go-cmp)) = v0.5.9
+Provides:       bundled(golang(github.com/google/go-cmp)) = v0.6.0
 Provides:       bundled(golang(github.com/google/go-containerregistry)) = v0.5.1
 Provides:       bundled(golang(github.com/google/gofuzz)) = v1.2.0
 Provides:       bundled(golang(github.com/google/martian)) = v2.1.0+incompatible
 Provides:       bundled(golang(github.com/google/martian/v3)) = v3.1.0
 Provides:       bundled(golang(github.com/google/pprof)) = 94a9f03dee38
 Provides:       bundled(golang(github.com/google/renameio)) = v0.1.0
-Provides:       bundled(golang(github.com/google/uuid)) = v1.3.0
+Provides:       bundled(golang(github.com/google/uuid)) = v1.3.1
 Provides:       bundled(golang(github.com/googleapis/gax-go/v2)) = v2.0.5
 Provides:       bundled(golang(github.com/googleapis/gnostic)) = v0.5.5
 Provides:       bundled(golang(github.com/gopherjs/gopherjs)) = 0766667cb4d1
@@ -274,7 +278,7 @@ Provides:       bundled(golang(github.com/jtolds/gls)) = v4.20.0+incompatible
 Provides:       bundled(golang(github.com/julienschmidt/httprouter)) = v1.3.0
 Provides:       bundled(golang(github.com/kisielk/errcheck)) = v1.5.0
 Provides:       bundled(golang(github.com/kisielk/gotool)) = v1.0.0
-Provides:       bundled(golang(github.com/klauspost/compress)) = v1.11.13
+Provides:       bundled(golang(github.com/klauspost/compress)) = v1.15.9
 Provides:       bundled(golang(github.com/konsorten/go-windows-terminal-sequences)) = v1.0.3
 Provides:       bundled(golang(github.com/kr/logfmt)) = b84e30acd515
 Provides:       bundled(golang(github.com/kr/pretty)) = v0.2.1
@@ -300,12 +304,12 @@ Provides:       bundled(golang(github.com/mitchellh/go-testing-interface)) = v1.
 Provides:       bundled(golang(github.com/mitchellh/gox)) = v0.4.0
 Provides:       bundled(golang(github.com/mitchellh/iochan)) = v1.0.0
 Provides:       bundled(golang(github.com/mitchellh/mapstructure)) = v1.1.2
-Provides:       bundled(golang(github.com/mitchellh/osext)) = 5e2d6d41470f
 Provides:       bundled(golang(github.com/moby/locker)) = v1.0.1
 Provides:       bundled(golang(github.com/moby/spdystream)) = v0.2.0
 Provides:       bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
 Provides:       bundled(golang(github.com/moby/sys/signal)) = v0.6.0
 Provides:       bundled(golang(github.com/moby/sys/symlink)) = v0.2.0
+Provides:       bundled(golang(github.com/moby/sys/user)) = v0.1.0
 Provides:       bundled(golang(github.com/moby/term)) = 9d4ed1856297
 Provides:       bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd
 Provides:       bundled(golang(github.com/modern-go/reflect2)) = v1.0.2
@@ -325,7 +329,7 @@ Provides:       bundled(golang(github.com/onsi/ginkgo/v2)) = v2.1.3
 Provides:       bundled(golang(github.com/onsi/gomega)) = v1.17.0
 Provides:       bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0
 Provides:       bundled(golang(github.com/opencontainers/image-spec)) = 3a7f492d3f1b
-Provides:       bundled(golang(github.com/opencontainers/runc)) = v1.1.5
+Provides:       bundled(golang(github.com/opencontainers/runc)) = v1.1.0
 Provides:       bundled(golang(github.com/opencontainers/runtime-spec)) = 1c3f411f0417
 Provides:       bundled(golang(github.com/opencontainers/runtime-tools)) = 1d69bd0f9c39
 Provides:       bundled(golang(github.com/opencontainers/selinux)) = v1.10.1
@@ -352,9 +356,9 @@ Provides:       bundled(golang(github.com/satori/go.uuid)) = v1.2.0
 Provides:       bundled(golang(github.com/sclevine/agouti)) = v3.0.0+incompatible
 Provides:       bundled(golang(github.com/sclevine/spec)) = v1.2.0
 Provides:       bundled(golang(github.com/sean-/seed)) = e2103e2c3529
-Provides:       bundled(golang(github.com/seccomp/libseccomp-golang)) = f33da4d89646
+Provides:       bundled(golang(github.com/seccomp/libseccomp-golang)) = 3879420cc921
 Provides:       bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = v1.0.0
-Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
+Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.9.3
 Provides:       bundled(golang(github.com/smartystreets/assertions)) = b2de0cb4f26d
 Provides:       bundled(golang(github.com/smartystreets/goconvey)) = v1.6.4
 Provides:       bundled(golang(github.com/soheilhy/cmux)) = v0.1.5
@@ -368,7 +372,7 @@ Provides:       bundled(golang(github.com/spf13/viper)) = v1.7.0
 Provides:       bundled(golang(github.com/stefanberger/go-pkcs11uri)) = 78d3cae3a980
 Provides:       bundled(golang(github.com/stoewer/go-strcase)) = v1.2.0
 Provides:       bundled(golang(github.com/stretchr/objx)) = v0.5.0
-Provides:       bundled(golang(github.com/stretchr/testify)) = v1.8.1
+Provides:       bundled(golang(github.com/stretchr/testify)) = v1.8.4
 Provides:       bundled(golang(github.com/subosito/gotenv)) = v1.2.0
 Provides:       bundled(golang(github.com/syndtr/gocapability)) = 42c35b437635
 Provides:       bundled(golang(github.com/tchap/go-patricia)) = v2.2.6+incompatible
@@ -399,48 +403,50 @@ Provides:       bundled(golang(go.etcd.io/etcd/raft/v3)) = v3.5.0
 Provides:       bundled(golang(go.etcd.io/etcd/server/v3)) = v3.5.0
 Provides:       bundled(golang(go.etcd.io/gofail)) = v0.1.0
 Provides:       bundled(golang(go.mozilla.org/pkcs7)) = 432b2356ecb1
-Provides:       bundled(golang(go.opencensus.io)) = v0.23.0
+Provides:       bundled(golang(go.opencensus.io)) = v0.24.0
 Provides:       bundled(golang(go.opentelemetry.io/contrib)) = v0.20.0
-Provides:       bundled(golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc)) = v0.28.0
+Provides:       bundled(golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc)) = v0.46.0
 Provides:       bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = v0.20.0
-Provides:       bundled(golang(go.opentelemetry.io/otel)) = v1.3.0
+Provides:       bundled(golang(go.opentelemetry.io/otel)) = v1.21.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp)) = v0.20.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/internal/retry)) = v1.3.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = v1.3.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = v1.3.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp)) = v1.3.0
-Provides:       bundled(golang(go.opentelemetry.io/otel/metric)) = v0.20.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/metric)) = v1.21.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/oteltest)) = v0.20.0
-Provides:       bundled(golang(go.opentelemetry.io/otel/sdk)) = v1.3.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/sdk)) = v1.21.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/sdk/export/metric)) = v0.20.0
 Provides:       bundled(golang(go.opentelemetry.io/otel/sdk/metric)) = v0.20.0
-Provides:       bundled(golang(go.opentelemetry.io/otel/trace)) = v1.3.0
+Provides:       bundled(golang(go.opentelemetry.io/otel/trace)) = v1.21.0
 Provides:       bundled(golang(go.opentelemetry.io/proto/otlp)) = v0.11.0
 Provides:       bundled(golang(go.uber.org/atomic)) = v1.7.0
 Provides:       bundled(golang(go.uber.org/goleak)) = v1.1.12
 Provides:       bundled(golang(go.uber.org/multierr)) = v1.6.0
 Provides:       bundled(golang(go.uber.org/zap)) = v1.17.0
-Provides:       bundled(golang(golang.org/x/crypto)) = 3147a52a75dd
+Provides:       bundled(golang(golang.org/x/crypto)) = v0.18.0
 Provides:       bundled(golang(golang.org/x/exp)) = 6cc2880d07d6
 Provides:       bundled(golang(golang.org/x/image)) = cff245a6509b
 Provides:       bundled(golang(golang.org/x/lint)) = 83fdc39ff7b5
 Provides:       bundled(golang(golang.org/x/mobile)) = d2bd2a29d028
 Provides:       bundled(golang(golang.org/x/mod)) = v0.8.0
-Provides:       bundled(golang(golang.org/x/net)) = v0.8.0
-Provides:       bundled(golang(golang.org/x/oauth2)) = 2bc19b11175f
-Provides:       bundled(golang(golang.org/x/sync)) = v0.1.0
-Provides:       bundled(golang(golang.org/x/sys)) = v0.6.0
-Provides:       bundled(golang(golang.org/x/term)) = v0.6.0
-Provides:       bundled(golang(golang.org/x/text)) = v0.8.0
+Provides:       bundled(golang(golang.org/x/net)) = v0.18.0
+Provides:       bundled(golang(golang.org/x/oauth2)) = v0.11.0
+Provides:       bundled(golang(golang.org/x/sync)) = v0.3.0
+Provides:       bundled(golang(golang.org/x/sys)) = v0.16.0
+Provides:       bundled(golang(golang.org/x/term)) = v0.16.0
+Provides:       bundled(golang(golang.org/x/text)) = v0.14.0
 Provides:       bundled(golang(golang.org/x/time)) = 1f47c861a9ac
 Provides:       bundled(golang(golang.org/x/tools)) = v0.6.0
 Provides:       bundled(golang(golang.org/x/xerrors)) = 5ec99f83aff1
 Provides:       bundled(golang(google.golang.org/api)) = v0.43.0
 Provides:       bundled(golang(google.golang.org/appengine)) = v1.6.7
 Provides:       bundled(golang(google.golang.org/cloud)) = 975617b05ea8
-Provides:       bundled(golang(google.golang.org/genproto)) = c8bf987b8c21
-Provides:       bundled(golang(google.golang.org/grpc)) = v1.50.1
-Provides:       bundled(golang(google.golang.org/protobuf)) = v1.28.1
+Provides:       bundled(golang(google.golang.org/genproto)) = b8732ec3820d
+Provides:       bundled(golang(google.golang.org/genproto/googleapis/api)) = b8732ec3820d
+Provides:       bundled(golang(google.golang.org/genproto/googleapis/rpc)) = b8732ec3820d
+Provides:       bundled(golang(google.golang.org/grpc)) = v1.59.0
+Provides:       bundled(golang(google.golang.org/protobuf)) = v1.33.0
 Provides:       bundled(golang(gopkg.in/airbrake/gobrake.v2)) = v2.0.9
 Provides:       bundled(golang(gopkg.in/alecthomas/kingpin.v2)) = v2.2.6
 Provides:       bundled(golang(gopkg.in/check.v1)) = 10cb98267c6c
@@ -457,7 +463,7 @@ Provides:       bundled(golang(gopkg.in/tomb.v1)) = dd632973f1e7
 Provides:       bundled(golang(gopkg.in/yaml.v2)) = v2.4.0
 Provides:       bundled(golang(gopkg.in/yaml.v3)) = v3.0.1
 Provides:       bundled(golang(gotest.tools)) = v2.2.0+incompatible
-Provides:       bundled(golang(gotest.tools/v3)) = v3.5.0
+Provides:       bundled(golang(gotest.tools/v3)) = v3.4.0
 Provides:       bundled(golang(honnef.co/go/tools)) = 2020.1.4
 Provides:       bundled(golang(k8s.io/api)) = v0.22.5
 Provides:       bundled(golang(k8s.io/apimachinery)) = v0.22.5
@@ -559,6 +565,9 @@ install -D -p -m 0644 %{S:3} %{buildroot}%{_sysctldir}/60-containerd.conf
 
 
 %changelog
+* Mon Apr 8 2024 Teddy Andrieux <teddy.andrieux@scality.com> - 1.6.31-1
+- Latest upstream
+
 * Mon Sep 25 2023 Teddy Andrieux <teddy.andrieux@scality.com> - 1.6.24-1
 - Latest upstream