rpms
/
containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.6.0~rc.2 Close: rhbz#1731597 Close: rhbz#1798419

This commit is contained in:
Robert-André Mauchin 2022-01-30 01:36:16 +01:00
parent ee9b079f4f
commit 41c62d25bc
6 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Revert-commit-for-Windows-metrics.patch
View File

@ -15,7 +15,7 @@ diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.
index a83e45ef..f8371401 100644
--- a/cmd/ctr/commands/tasks/metrics.go
+++ b/cmd/ctr/commands/tasks/metrics.go
@@ -25,9 +25,6 @@ import (
@@ -23,9 +23,6 @@ import (
"os"
"text/tabwriter"
@ -25,7 +25,7 @@ index a83e45ef..f8371401 100644
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/typeurl"
"github.com/urfave/cli"
@@ -79,42 +76,12 @@ var metricsCommand = cli.Command{
@@ -77,42 +74,12 @@ var metricsCommand = cli.Command{
if err != nil {
return err
}
@ -68,7 +68,7 @@ index a83e45ef..f8371401 100644
return w.Flush()
case formatJSON:
marshaledJSON, err := json.MarshalIndent(anydata, "", " ")
@@ -128,83 +95,3 @@ var metricsCommand = cli.Command{
@@ -126,83 +93,3 @@ var metricsCommand = cli.Command{
}
},
}

14
0002-Remove-windows-only-dep.patch
View File

@ -1,16 +1,16 @@
diff --color -Naur a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
--- a/pkg/cri/server/helpers.go 2021-11-17 21:04:57.000000000 +0100
+++ b/pkg/cri/server/helpers.go 2021-11-22 22:39:01.743745977 +0100
@@ -23,7 +23,7 @@
"strconv"
"strings"
@@ -39,7 +39,7 @@ import (
"github.com/containerd/typeurl"
"github.com/sirupsen/logrus"
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
"github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
clabels "github.com/containerd/containerd/labels"
@@ -366,8 +366,8 @@
imagedigest "github.com/opencontainers/go-digest"
"github.com/pelletier/go-toml"
"golang.org/x/net/context"
@@ -365,8 +365,8 @@ func getRuntimeOptionsType(t string) int
return &runcoptions.Options{}
case plugin.RuntimeLinuxV1:
return &runctypes.RuncOptions{}

13
containerd.service
View File

@ -1,13 +0,0 @@
[Unit]
Description=containerd container runtime
Documentation=https://containerd.io
After=network.target
[Service]
ExecStartPre=/sbin/modprobe overlay
ExecStart=/usr/bin/containerd
Delegate=yes
KillMode=process
[Install]
WantedBy=multi-user.target

36
containerd.spec
View File

@ -7,7 +7,8 @@
# https://github.com/containerd/containerd
%global goipath github.com/containerd/containerd
Version: 1.5.9
Version: 1.6.0~rc.2
%global tag v1.6.0-rc.2
%gometa
@ -33,7 +34,6 @@ Summary: Open and reliable container runtime
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
Source1: containerd.service
Source2: containerd.toml
# Carve out code requiring github.com/Microsoft/hcsshim
Patch0: 0001-Revert-commit-for-Windows-metrics.patch
@ -86,14 +86,17 @@ BuildRequires: golang(github.com/gogo/protobuf/types)
BuildRequires: golang(github.com/gogo/protobuf/vanity)
BuildRequires: golang(github.com/gogo/protobuf/vanity/command)
BuildRequires: golang(github.com/google/uuid)
BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-middleware)
BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus)
BuildRequires: golang(github.com/hashicorp/go-multierror)
BuildRequires: golang(github.com/imdario/mergo)
BuildRequires: golang(github.com/intel/goresctrl/pkg/rdt)
BuildRequires: golang(github.com/klauspost/compress/zstd)
# BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options)
# BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats)
BuildRequires: golang(github.com/moby/locker)
BuildRequires: golang(github.com/moby/sys/mountinfo)
BuildRequires: golang(github.com/moby/sys/signal)
BuildRequires: golang(github.com/moby/sys/symlink)
BuildRequires: golang(github.com/opencontainers/go-digest)
BuildRequires: golang(github.com/opencontainers/go-digest/digestset)
@ -105,21 +108,33 @@ BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label)
BuildRequires: golang(github.com/pelletier/go-toml)
BuildRequires: golang(github.com/pkg/errors)
BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
BuildRequires: golang(github.com/sirupsen/logrus)
BuildRequires: golang(github.com/stretchr/testify/require)
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: golang(github.com/urfave/cli)
BuildRequires: golang(github.com/vishvananda/netlink)
BuildRequires: golang(go.etcd.io/bbolt)
BuildRequires: golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc)
BuildRequires: golang(go.opentelemetry.io/otel)
BuildRequires: golang(go.opentelemetry.io/otel/attribute)
BuildRequires: golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)
BuildRequires: golang(go.opentelemetry.io/otel/propagation)
BuildRequires: golang(go.opentelemetry.io/otel/sdk/resource)
BuildRequires: golang(go.opentelemetry.io/otel/sdk/trace)
BuildRequires: golang(go.opentelemetry.io/otel/semconv/v1.4.0)
BuildRequires: golang(go.opentelemetry.io/otel/trace)
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/net/context/ctxhttp)
BuildRequires: golang(golang.org/x/sync/errgroup)
BuildRequires: golang(golang.org/x/sync/semaphore)
BuildRequires: golang(golang.org/x/sys/execabs)
BuildRequires: golang(golang.org/x/sys/unix)
BuildRequires: golang(google.golang.org/grpc)
BuildRequires: golang(google.golang.org/grpc/backoff)
BuildRequires: golang(google.golang.org/grpc/codes)
BuildRequires: golang(google.golang.org/grpc/credentials)
BuildRequires: golang(google.golang.org/grpc/credentials/insecure)
BuildRequires: golang(google.golang.org/grpc/grpclog)
BuildRequires: golang(google.golang.org/grpc/health)
BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1)
@ -132,7 +147,6 @@ BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors)
BuildRequires: golang(k8s.io/apimachinery/pkg/api/resource)
BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1)
BuildRequires: golang(k8s.io/apimachinery/pkg/types)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/clock)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream/spdy)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/net)
@ -144,20 +158,21 @@ BuildRequires: golang(k8s.io/apiserver/pkg/util/wsstream)
BuildRequires: golang(k8s.io/client-go/tools/remotecommand)
BuildRequires: golang(k8s.io/client-go/util/cert)
BuildRequires: golang(k8s.io/component-base/logs/logreduction)
BuildRequires: golang(k8s.io/cri-api/pkg/apis)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
BuildRequires: golang(k8s.io/klog/v2)
BuildRequires: golang(k8s.io/utils/clock)
BuildRequires: golang(k8s.io/utils/exec)
%if %{with check}
# Tests
BuildRequires: golang(github.com/containerd/continuity/testutil)
BuildRequires: golang(github.com/containerd/continuity/testutil/loopback)
BuildRequires: golang(github.com/golang/protobuf/proto)
BuildRequires: golang(github.com/google/go-cmp/cmp)
BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts)
BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: golang(github.com/stretchr/testify/require)
BuildRequires: golang(google.golang.org/protobuf/proto)
BuildRequires: golang(k8s.io/utils/clock/testing)
%endif
Requires: runc
@ -172,6 +187,8 @@ Requires: runc
%autopatch -p1
# Used only for generation:
rm -rf cmd/protoc-gen-gogoctrd
# Replace default bin directory
sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service
%if %{without bootstrap}
%build
@ -198,8 +215,9 @@ install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8
install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8
install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8
install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5
install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service
install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
mkdir -p %{buildroot}%{_sharedstatedir}/containerd/opt
%endif
%post
@ -229,6 +247,8 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
%{_unitdir}/containerd.service
%dir %{_sysconfdir}/containerd
%config(noreplace) %{_sysconfdir}/containerd/config.toml
%dir %{_sharedstatedir}/containerd
%dir %{_sharedstatedir}/containerd/opt
%endif
%gopkgfiles

22
containerd.toml
View File

@ -1,15 +1,9 @@
#root = "/var/lib/containerd"
#state = "/run/containerd"
#subreaper = true
#oom_score = 0
version = 2
#[grpc]
# address = "/run/containerd/containerd.sock"
# uid = 0
# gid = 0
#[debug]
# address = "/run/containerd/debug.sock"
# uid = 0
# gid = 0
# level = "info"
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "/usr/libexec/cni/"
conf_dir = "/etc/cni/net.d"
[plugins."io.containerd.internal.v1.opt"]
path = "/var/lib/containerd/opt"

2
sources
View File

@ -1 +1 @@
SHA512 (containerd-1.5.9.tar.gz) = 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
SHA512 (containerd-1.6.0-rc.2.tar.gz) = 37aa74d85e870ab55a922a796020c1244d64605b23662890f34fc67852ce442cb0467774efea4b29ec5127fa0fefb6f78cc7bcda6e3ec425c029aa22385a0935