Sebastiaan van Stijn
bfba0f2840
Bump Golang 1.13.14
...
full diff: https://github.com/golang/go/compare/go1.13.12...go1.13.14
- go1.13.14 (released 2020/07/16) includes fixes to the compiler, vet, and the
database/sql, net/http, and reflect packages. See the Go 1.13.14 milestone on
the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved
- go1.13.13 (released 2020/07/14) includes security fixes to the crypto/x509 and
net/http packages. See the Go 1.13.13 milestone on our issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.13+label%3ACherryPickApproved
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 13:29:16 +02:00
Sebastiaan van Stijn
3cc2be2a87
Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
...
full diff: 16911795a3...2bf7674922
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 13:17:11 +02:00
Tonis Tiigi
b5185eae6c
auth: return token structs from fetcher functions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-08-04 12:59:06 -07:00
Derek McGowan
85b15eff45
Merge pull request #4449 from dmcgowan/prepare-1.4.0-rc.0
...
Prepare 1.4.0-rc.0 release
2020-08-04 10:57:07 -07:00
Derek McGowan
6288559231
Prepare 1.4.0-rc.0 release
...
Move beta release notes and update version
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 22:22:53 -07:00
Maksym Pavlenko
666198cd2a
Merge pull request #4446 from kzys/devmapper-platform
...
snapshots/devmapper: don't hardcord the platform strings
2020-08-03 13:11:38 -07:00
Kazuyoshi Kato
74e9aa7abb
snapshots/devmapper: don't hardcord the platform strings
...
The snapshotter doesn't have to exclude non-amd64 platforms.
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-08-03 11:55:36 -07:00
Akihiro Suda
0f08a55d6b
Merge pull request #4413 from dmcgowan/registry-proxy-ns
...
Add namespace query parameter for registry proxying
2020-08-04 01:58:52 +09:00
Derek McGowan
adeba792f1
Add namespace query parameter for registry proxying
...
Proxy registries are designed to serve content from upstreams.
However, the proxy hostname will usually not match the hostname
of the upstream, requiring the proxy to only use a single
upstream or use its own pattern matching to determine the upstream.
To solve this issue, the client will pass along the namespace which
is being used for the request, allowing mirrors to easily map
to multiple upstreams. This query parameter can safely be ignored
if multiple upstreams are not supported.
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 09:32:44 -07:00
Akihiro Suda
49837814b3
Merge pull request #4433 from Yikun/enable-new-nodeset
...
Change nodeset to `ubuntu-xenial-arm64-openlab`
2020-08-03 16:26:38 +09:00
Tonis Tiigi
957bcb3dff
docker: split private token helper functions to reusable pkg
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-08-02 22:50:46 -07:00
Maksym Pavlenko
bd92d567a5
Merge pull request #4442 from estesp/noop-deps
...
Remove seccomp/Linux deps steps in GH Actions
2020-07-31 16:13:34 -07:00
Phil Estes
5a190c7077
Remove seccomp/Linux deps steps in GH Actions
...
Recent changes removed the need for libseccomp-dev when building
containerd. The btrfs tools package is already installed on GH Actions
runners and was already a no-op so the whole step can be removed.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-31 11:25:26 -04:00
Phil Estes
6162ae93db
Merge pull request #4439 from AkihiroSuda/cri-20200731
...
vendor: update cri (no more libseccomp cgo dependency)
2020-07-31 11:21:11 -04:00
Akihiro Suda
6988b4d640
remove seccomp
buildtag
...
The cgo dependency on libseccomp was removed in containerd/cri#1548 .
The `seccomp` build tag is now ignored (and the seccomp support is always built-in).
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:41:41 +09:00
Akihiro Suda
362b7167a7
vendor: update cri (no more libseccomp cgo dependency)
...
8448b92d23...8871d5cdf8
The cgo dependency on libseccomp was removed in containerd/cri#1548 .
The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:32:08 +09:00
Wei Fu
8871d5cdf8
Merge pull request #1548 from AkihiroSuda/remove-libseccomp-dependency
...
remove libseccomp cgo dependency
2020-07-30 23:30:04 +08:00
Wei Fu
df8352f1ff
Merge pull request #4335 from ktock/sn-doc
...
Add doc about snapshotter based on shared remote storage
2020-07-30 23:19:59 +08:00
Wei Fu
4a96be9795
Merge pull request #4431 from TBBle/import_manifest_for_test_binary
...
Import Windows manifest into test build, rather than copying by script
2020-07-30 23:13:15 +08:00
Michael Crosby
fa1220fce3
Merge pull request #4436 from tonistiigi/tokenscopes-public
...
remotes: mark GetTokenScopes public
2020-07-30 11:07:46 -04:00
Akihiro Suda
7332e2ad2e
remove libseccomp cgo dependency
...
The CRI plugin was depending on libseccomp cgo dependency via
libseccomp-golang via libcontainer.
https://github.com/seccomp/libseccomp-golang/blob/v0.9.1/seccomp_internal.go#L17
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-30 18:51:23 +09:00
Tonis Tiigi
03b5a053ea
remotes: mark GetTokenScopes public
...
Authorizer interface can’t be really implemented because
scopes are passed in on a side channel via private value in context.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-07-29 23:01:36 -07:00
Akihiro Suda
779ef60231
Merge pull request #4435 from tao12345666333/update-runc
...
vendor runc library to v1.0.0-rc91-48-g67169a9d
2020-07-30 13:10:51 +09:00
Yikun Jiang
b43a01a221
Change nodeset to ubuntu-xenial-arm64-openlab
...
The old nodeset is unstable and apt source is unavailable, we change the nodeset from `ubuntu-xenial-arm64` to `ubuntu-xenial-arm64-openlab` to enable stable new nodeset.
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
2020-07-30 09:22:38 +08:00
Mike Brown
858a766264
Merge pull request #1547 from mikebrow/containerd-list-podid-should-search
...
adds support for pod id lookup for filter
2020-07-29 17:39:18 -05:00
Mike Brown
8a2d1cc802
adds support for pod id lookup for filter
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-29 15:23:22 -05:00
Derek McGowan
c2a6f180d7
Merge pull request #4428 from thaJeztah/bump_continuity
...
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
2020-07-29 12:33:31 -07:00
Derek McGowan
d4b17275d6
Merge pull request #4384 from AkihiroSuda/deprecate-legacy-shims
...
Deprecate legacy shims
2020-07-29 11:30:09 -07:00
Akihiro Suda
04b98bb0ee
Deprecate legacy shims
...
Fix #4365
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-30 01:57:12 +09:00
Mike Brown
c209d013cb
Merge pull request #1545 from ktock/ssdoc
...
Add description about `disable_snapshot_annotations` to configuration doc
2020-07-29 11:48:30 -05:00
Mike Brown
fe9bb8da65
Merge branch 'master' into ssdoc
2020-07-29 11:44:10 -05:00
Mike Brown
63400c7694
Merge pull request #1543 from ktock/discard-content
...
Allow GC to discard content after successful pull and unpack
2020-07-29 11:39:28 -05:00
Derek McGowan
40b22ef074
Merge pull request #4429 from crosbymichael/task-spec
...
Add Spec() method to task
2020-07-29 09:35:37 -07:00
Akihiro Suda
9a3e95d351
Merge pull request #4430 from crosbymichael/ctr-cpus
...
Add --cpus flag to ctr
2020-07-30 01:27:00 +09:00
Jintao Zhang
b870231854
vendor runc library to v1.0.0-rc91-48-g67169a9d
...
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-29 14:52:48 +08:00
Michael Crosby
02afa94256
Add --cpus flag to ctr
...
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-28 23:06:07 -04:00
Paul "TBBle" Hampson
aa56cfc0a8
Import Windows manifest into test build, rather than copying by script
...
This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-29 06:02:35 +10:00
Phil Estes
eb6354a118
Merge pull request #4427 from TBBle/test_improvements
...
Some small test improvements
2020-07-28 14:36:44 -04:00
Akihiro Suda
0f99e0f53e
Merge pull request #1542 from sachaos/master
...
Update config syntax in registry.md (GCR example)
2020-07-29 02:30:20 +09:00
Sebastiaan van Stijn
5b1627410d
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
...
full diff: d3ef23f19f...efbc4488d8
Fix sameFile() to recognize empty files as the same
- fixes "Empty files can diff as "modified" even when they're not"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 16:39:35 +02:00
Paul "TBBle" Hampson
1ec1e9eabf
Add Windows 10/Windows Server 2004 for integration tests
...
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:36:00 +10:00
Paul "TBBle" Hampson
faa4ff56e4
Usefully fail tests with unknown or bad Windows Build version
...
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:35:33 +10:00
Paul "TBBle" Hampson
3795dd41ae
Always report server log from verbose integration test runs
...
If you're adding `-v` to TESTFLAGS, you probably want to see the server
logs, as well as the extra output from the testing framework.
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:33:59 +10:00
Takumasa Sakao
4c8164bccf
Specify version = 2 & fix wrong key in registry.md (GCR example)
...
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
2020-07-28 17:54:12 +09:00
Michael Crosby
4318f93f9c
Add Spec() method to task
...
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-27 21:32:15 -04:00
ktock
375dd76255
Add description about disable_snapshot_annotations
to configuration doc
...
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-28 09:30:20 +09:00
ktock
c80660b82b
Allow GC to discard content after successful pull and unpack
...
This commit adds a config flag for allowing GC to clean layer contents up after
unpacking these contents completed, which leads to deduplication of layer
contents between the snapshotter and the contnet store.
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-28 09:05:47 +09:00
ktock
b51177bfcc
Vendor containerd d184a0a343
...
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-27 10:48:20 +09:00
Akihiro Suda
d184a0a343
Merge pull request #4414 from dmcgowan/discard-content
...
Set content labels based on content type
2020-07-24 16:31:46 +09:00
Derek McGowan
67f19bfdd8
Merge pull request #4388 from AkihiroSuda/fix-mount-wait-no-child-processes
...
mount: retry executing the helper binary on ECHILD
2020-07-23 23:20:16 -07:00