diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 23adb7830..c14a14fc2 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -3,8 +3,8 @@ boost_1_67_0.tar.bz2#boost_1_67_0#https://dl.bintray.com/boostorg/release/1.67.0 ceph-erasure-code-corpus-2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7.tar.gz#ceph-erasure-code-corpus#https://api.github.com/repos/ceph/ceph-erasure-code-corpus/tarball/2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7#https## ceph-object-corpus-e32bf8ca3dc6151ebe7f205ba187815bc18e1cef.tar.gz#ceph-object-corpus#https://api.github.com/repos/ceph/ceph-object-corpus/tarball/e32bf8ca3dc6151ebe7f205ba187815bc18e1cef#https## civetweb-ff2881e2cd5869a71ca91083bad5d12cccd22136.tar.gz#civetweb#https://api.github.com/repos/ceph/civetweb/tarball/ff2881e2cd5869a71ca91083bad5d12cccd22136#https## -containerd-v1.3.0.tar.gz#containerd#https://github.com/containerd/containerd/archive/v1.3.0.tar.gz#https## -crictl-v1.16.0-linux-amd64.tar.gz#crictl#https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.16.0/crictl-v1.16.0-linux-amd64.tar.gz#https## +containerd-v1.3.3.tar.gz#containerd#https://github.com/containerd/containerd/archive/v1.3.3.tar.gz#https## +crictl-v1.18.0-linux-amd64.tar.gz#crictl#https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.18.0/crictl-v1.18.0-linux-amd64.tar.gz#https## # docker-distribution-48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#docker-distribution#github.com/docker/distribution/archive/48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#http## # docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#docker-libtrust#https://github.com/docker/libtrust/archive/fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#http## dpdk-18.11.tar.xz#dpdk-18.11#http://fast.dpdk.org/rel/dpdk-18.11.tar.xz#http## @@ -66,7 +66,7 @@ rapidjson-f54b0e47a08782a6131cc3d60f94d038fa6e0a51.tar.gz#rapidjson#https://api. Redfishtool-1.1.0.tar.gz#Redfishtool-1.1.0#https://github.com/DMTF/Redfishtool/archive/1.1.0.tar.gz#http## requests-toolbelt-0.9.1.tar.gz#requests-toolbelt-0.9.1#https://github.com/requests/toolbelt/archive/0.9.1.tar.gz#http## rocksdb-f4a857da0b720691effc524469f6db895ad00d8e.tar.gz#rocksdb#https://api.github.com/repos/ceph/rocksdb/tarball/f4a857da0b720691effc524469f6db895ad00d8e#https## -runc-1.0.0-rc8.tar.gz#runc#https://github.com/opencontainers/runc/archive/v1.0.0-rc8.tar.gz#https## +runc-1.0.0-rc10.tar.gz#runc#https://github.com/opencontainers/runc/archive/v1.0.0-rc10.tar.gz#https## # Sirupsen-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz#Sirupsen-logrus#github.com/Sirupsen/logrus/archive/55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz#http## spdk-f474ce6930f0a44360e1cc4ecd606d2348481c4c.tar.gz#spdk#https://api.github.com/repos/ceph/spdk/tarball/f474ce6930f0a44360e1cc4ecd606d2348481c4c#https## spectre-meltdown-checker-0.37+-5cc77741.tar.gz#spectre-meltdown-checker#https://github.com/speed47/spectre-meltdown-checker/tarball/5cc77741af1d2f52140aa9f89339f56b6c4b6783#http## diff --git a/kubernetes/containerd/centos/build_srpm.data b/kubernetes/containerd/centos/build_srpm.data index 967c6d5ae..8d6c76f6f 100644 --- a/kubernetes/containerd/centos/build_srpm.data +++ b/kubernetes/containerd/centos/build_srpm.data @@ -1,6 +1,6 @@ -COPY_LIST="${STX_BASE}/downloads/containerd-v1.3.0.tar.gz - ${STX_BASE}/downloads/runc-1.0.0-rc8.tar.gz - ${STX_BASE}/downloads/crictl-v1.16.0-linux-amd64.tar.gz +COPY_LIST="${STX_BASE}/downloads/containerd-v1.3.3.tar.gz + ${STX_BASE}/downloads/runc-1.0.0-rc10.tar.gz + ${STX_BASE}/downloads/crictl-v1.18.0-linux-amd64.tar.gz ${FILES_BASE}/*" TIS_PATCH_VER=1 diff --git a/kubernetes/containerd/centos/containerd.spec b/kubernetes/containerd/centos/containerd.spec index f0b0074b6..f6513e22b 100644 --- a/kubernetes/containerd/centos/containerd.spec +++ b/kubernetes/containerd/centos/containerd.spec @@ -3,14 +3,14 @@ # Copyright (C) 2019 Intel Corporation # Name: containerd -Version: 1.3.0 +Version: 1.3.3 Release: %{tis_patch_ver}%{?_tis_dist} Summary: Open and reliable container runtime Group: Kubernetes License: ASL 2.0 Source0: containerd-v%{version}.tar.gz -Source1: runc-1.0.0-rc8.tar.gz -Source2: crictl-v1.16.0-linux-amd64.tar.gz +Source1: runc-1.0.0-rc10.tar.gz +Source2: crictl-v1.18.0-linux-amd64.tar.gz Source3: crictl.yaml Source4: containerd.service Patch5: 0001-customize-containerd-for-StarlingX.patch @@ -22,7 +22,7 @@ Packager: StarlingX BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsystemd-journal) -BuildRequires: golang >= 1.10.0 +BuildRequires: golang >= 1.12.16 BuildRequires: systemd BuildRequires: rsync BuildRequires: go-md2man diff --git a/kubernetes/containerd/centos/files/0001-customize-containerd-for-StarlingX.patch b/kubernetes/containerd/centos/files/0001-customize-containerd-for-StarlingX.patch index 8fbe1fc79..67239c248 100644 --- a/kubernetes/containerd/centos/files/0001-customize-containerd-for-StarlingX.patch +++ b/kubernetes/containerd/centos/files/0001-customize-containerd-for-StarlingX.patch @@ -1,4 +1,4 @@ -From fb2f78f1a3f1ec51a12f1404c21651dc0144663e Mon Sep 17 00:00:00 2001 +From 311301438b0366004e238cbcc2ca07d38d8a9369 Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Wed, 25 Sep 2019 20:02:34 +0800 Subject: [PATCH] customize containerd for StarlingX @@ -16,7 +16,7 @@ Signed-off-by: Shuicheng Lin 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/containerd/Makefile b/containerd/Makefile -index 6758161..49dd612 100644 +index 37012e8..7ab6a22 100644 --- a/containerd/Makefile +++ b/containerd/Makefile @@ -20,7 +20,7 @@ ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) @@ -24,11 +24,11 @@ index 6758161..49dd612 100644 # Used to populate variables in version package. -VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always) -+VERSION="v1.3.0" ++VERSION=v1.3.3 REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) PACKAGE=github.com/containerd/containerd -@@ -90,6 +90,7 @@ endif +@@ -95,6 +95,7 @@ endif # Build tags seccomp and apparmor are needed by CRI plugin. GO_BUILDTAGS ?= seccomp apparmor GO_BUILDTAGS += ${DEBUG_TAGS} @@ -37,7 +37,7 @@ index 6758161..49dd612 100644 GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)' diff --git a/containerd/remotes/docker/authorizer.go b/containerd/remotes/docker/authorizer.go -index 9652d3a..38ab5fb 100644 +index 9652d3a..72a6f3a 100644 --- a/containerd/remotes/docker/authorizer.go +++ b/containerd/remotes/docker/authorizer.go @@ -366,7 +366,8 @@ func (ah *authHandler) fetchTokenWithOAuth(ctx context.Context, to tokenOptions) @@ -51,5 +51,5 @@ index 9652d3a..38ab5fb 100644 } else if resp.StatusCode < 200 || resp.StatusCode >= 400 { b, _ := ioutil.ReadAll(io.LimitReader(resp.Body, 64000)) // 64KB -- -2.7.4 +2.16.6