Commit Graph

10081 Commits

Author SHA1 Message Date
Mike Brown
3157392513 just release ctd-decoder not ctr-enc
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-05-13 15:56:45 -05:00
Mike Brown
b9c403e79a Merge remote-tracking branch 'upstream/master' 2021-05-13 15:55:53 -05:00
Gijs Peskens
1442fee229 Remove mountpoints not commonly mounted on FreeBSD
Signed-off-by: Gijs Peskens <gijs@peskens.net>
2021-05-13 21:36:53 +02:00
Derek McGowan
fc4da9728e Pin integration test image for alpine
The latest tag is no longer available for alpine, pin
to the latest version rather than using latest

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-13 14:10:59 -04:00
Fu Wei
c7e4747cfb
Merge pull request #5313 from claudiubelu/pull-images-once
cri-integration tests: Pull images once
2021-05-13 11:10:52 +08:00
Fu Wei
b9e1d0cd27
Merge pull request #5440 from Iceber/optimize-last-registration
plugin: optimize the check for the last registration
2021-05-13 10:51:36 +08:00
Fu Wei
18f3458180
Merge pull request #5465 from Iceber/update-lease-manager
metadata: modify NewLeaseManager to return leases.Manager
2021-05-13 10:47:15 +08:00
Phil Estes
e47400cbd2
Merge pull request #5100 from adisky/skip-tls-localHost
Skip TLS verification for localhost
2021-05-12 14:56:53 -04:00
Mike Brown
74c7d66dfb Merge remote-tracking branch 'upstream/master' 2021-05-12 13:25:53 -05:00
Derek McGowan
28e29af62d
Merge pull request #5492 from oss-qm/submit/install-man
Makefile: make sure manpages are built before install-man
2021-05-12 09:29:30 -07:00
Phil Estes
a5f19b02d0
Merge pull request #5309 from mikebrow/document-hosts.toml
adds description for hosts.toml
2021-05-12 10:07:00 -04:00
Enrico Weigelt, metux IT consult
9643c99658 Makefile: allow overriding install command via environment
Packaging systems often want to override the install(1) command via INSTALL
environment variable, in order to do distro specific fixups (eg. splitting
out debug symbols from binaries to separate files).

Also use it for creating install target directories.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-05-12 15:52:51 +02:00
Enrico Weigelt, metux IT consult
4b1b8346be Makefile: make sure manpages are built before install-man
Let install-man depend on man, so manpages are really built before
trying to install them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-05-12 15:50:10 +02:00
Mike Brown
6e249b1aea adds credentials description
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-05-12 08:37:37 -05:00
Maksym Pavlenko
08fa9ab625
Merge pull request #5459 from dmcgowan/prepare-default-branch-rename
Prepare default branch rename
2021-05-11 09:56:32 -07:00
Mike Brown
d024133308 Merge remote-tracking branch 'upstream/master' 2021-05-10 16:25:23 -05:00
Gijs Peskens
de04b32430 Add copyright header & make sure compilation succeeds on all platforms
Signed-off-by: Gijs Peskens <gijs@peskens.net>
2021-05-10 21:49:46 +02:00
Gijs Peskens
e1fd6be7e8 Fix mounts for FreeBSD
Signed-off-by: Gijs Peskens <gijs@peskens.net>
2021-05-10 21:49:46 +02:00
Derek McGowan
d0240b31f9
Merge pull request #5473 from dims/update-runc-to-rc94
Update runc to rc94
2021-05-10 11:53:32 -07:00
Davanum Srinivas
de6db4038c
Update vendored runc to v1.0.0.0-rc94
Note that this is the code in containerd that uses runc (as almost
a library). Please see the other commit for the update to runc binary
itself.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-10 13:12:48 -04:00
Davanum Srinivas
5c99f150ae
Update the runc binary used with containerd to runc v1.0.0-rc94
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-10 13:11:07 -04:00
Mike Brown
d559b00fe6 Merge remote-tracking branch 'upstream/release/1.5' 2021-05-10 09:18:34 -05:00
Phil Estes
1987f0ad1a
Merge pull request #5468 from wzshiming/fix/close-file
Fix `content.ReaderAt` close
2021-05-10 10:12:36 -04:00
Phil Estes
ec0e1a4f3e
Merge pull request #5466 from dmcgowan/update-release
Update releases doc with updated support timeline
2021-05-10 09:50:39 -04:00
Shiming Zhang
b890f056e8 Fix content.ReaderAt close
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-05-08 12:39:09 +08:00
Phil Estes
01ca105b6a
Merge pull request #5452 from Dentrax/feature/add-test-for-adaptor
tests: add test for adaptor
2021-05-07 17:42:05 -04:00
Phil Estes
f6fc6041ab
Merge pull request #5450 from oss-qm/submit/makefile-go-command
Makefile: allow overriding go command by environment
2021-05-07 17:41:45 -04:00
Derek McGowan
c5797c8fcb
Update releases doc with updated support timeline
Updates for 1.5 release and adds 1.6

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-07 14:22:01 -07:00
Derek McGowan
1ecc98f1de
Merge pull request #5462 from mikebrow/correct-critools-release
update to new cri-tools make install
2021-05-07 13:05:13 -07:00
Mike Brown
c74a6c4194 update to new cri-tools make install
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-05-07 12:45:24 -05:00
Iceber Gu
e37ddafab4 metadata: modify NewLeaseManager to return leases.Manager
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-05-07 21:26:17 +08:00
Akihiro Suda
087d03bc55
Merge pull request #5461 from tao12345666333/update-go-1.16.4
Update Go to 1.16.4
2021-05-07 15:33:34 +09:00
Jintao Zhang
79d800b9b0 Update Go to 1.16.4
fix [#45710](https://github.com/golang/go/issues/45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-05-07 07:07:09 +08:00
Derek McGowan
0ba7303ee8
Prepare default branch rename
Use renamed branch for containerd/project

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-06 09:28:42 -07:00
Fu Wei
ab963e1cc1
Merge pull request #5063 from Iceber/fix-with-dev-shm-size
oci: fix WithDevShmSize
2021-05-06 23:48:04 +08:00
Phil Estes
7507b47c36
Merge pull request #5457 from thaJeztah/1.5_backport_dont_loop_da_loop
[release/1.5] go.mod: cut circular dependency on github.com/containerd/containerd
2021-05-06 09:52:25 -04:00
Sebastiaan van Stijn
b35aa7250a
go.mod: cut circular dependency on github.com/containerd/containerd
This forces vendoring to only take dependencies of this repository to
be taken into account, effectively cutting the circular dependency (for
the vendored code), and to prevent depending on transitive dependencies
coming from older versions of containerd.

go mod does not allow using the main module as a local "replace" rule using
a path; see golang/go#45492 and golang/go#34417, so instead, an empty module
is used.

One change observed is that older versions containerd depended on an older
version of imgcrypt that had an "indirect" dependency on more current versions
of gopkg.in/yaml.v2 and prometheus/procfs.

For those, a temporary "indirect" dependency was added, until prometheus/client_golang
and kubernetes are updated.

from go mod graph (before):

    github.com/containerd/imgcrypt@v1.0.4-0.20210301171431-0ae5c75f59ba gopkg.in/yaml.v2@v2.4.0
    github.com/containerd/imgcrypt@v1.0.4-0.20210301171431-0ae5c75f59ba github.com/prometheus/procfs@v0.6.0

For some reason, some older versions of containerd are still taken into account,
causing satori/go.uuid to be added as "indirect" dependency, likely because some
modules have this dependency in their go.sum. This should likely disappear once
those plugins are updated to contain a current version of containerd.

    git grep 'github.com/satori/go.uuid'
    vendor/github.com/Microsoft/hcsshim/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/aufs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/imgcrypt/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/nri/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/zfs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e26fc84729)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-06 12:42:11 +02:00
Sebastiaan van Stijn
b684056399
integration/client: go mod tidy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 15e0bd513e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-06 12:42:08 +02:00
Akihiro Suda
14316794ad
Merge pull request #5454 from estesp/cp-5411 2021-05-06 02:18:34 +09:00
Furkan
7d70992d33
tests: add test for adaptor
I noticed AdaptInfo missing test cases. I think this
func a bit important to test since we use this func
in other packages like content, store (walking), etc.

Signed-off-by: Furkan Turkal <furkan.turkal@trendyol.com>
Signed-off-by: Furkan <furkan.turkal@trendyol.com>
2021-05-05 17:39:39 +03:00
Kevin Parsons
e120261ee3
windows: Use GetFinalPathNameByHandle for ResolveSymbolicLink
This change splits the definition of pkg/cri/os.ResolveSymbolicLink by
platform (windows/!windows), and switches to an alternate implementation
for Windows. This aims to fix the issue described in containerd/containerd#5405.

The previous implementation which just called filepath.EvalSymlinks has
historically had issues on Windows. One of these issues we were able to
fix in Go, but EvalSymlinks's behavior is not well specified on
Windows, and there could easily be more issues in the future, so it
seems prudent to move to a separate implementation for Windows.

The new implementation uses the Windows GetFinalPathNameByHandle API,
which takes a handle to an open file or directory and some flags, and
returns the "real" name for the object. See comments in the code for
details on the implementation.

I have tested this change with a variety of mounts and everything seems
to work as expected. Functions that make incorrect assumptions on what a
Windows path can look like may have some trouble with the \\?\ path
syntax. For instance EvalSymlinks fails when given a \\?\UNC\ path. For
this reason, the resolvePath implementation modifies the returned path
to translate to the more common form (\\?\UNC\server\share ->
\\server\share).

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
(cherry picked from commit b0d3b35b28)
Signed-off-by: Phil Estes <estesp@gmail.com>
2021-05-05 10:00:14 -04:00
Phil Estes
1e8ec32698
Merge pull request #5411 from kevpar/win-evalsymlinks
windows: Use GetFinalPathNameByHandle for ResolveSymbolicLink
2021-05-05 09:52:13 -04:00
Phil Estes
93725cdb2e
Merge pull request #5448 from Dentrax/fix/doc-client-import
doc: add missing namespaces package
2021-05-05 09:50:14 -04:00
Furkan
0b786908c0
doc: add missing namespaces package
Currently, we can not reproduce the given Namespaces
section examples written in the README, since it's
not clear to which package should we import to.

Signed-off-by: Furkan Turkal <furkan.turkal@trendyol.com>
2021-05-04 22:04:01 +03:00
Kevin Parsons
b0d3b35b28 windows: Use GetFinalPathNameByHandle for ResolveSymbolicLink
This change splits the definition of pkg/cri/os.ResolveSymbolicLink by
platform (windows/!windows), and switches to an alternate implementation
for Windows. This aims to fix the issue described in containerd/containerd#5405.

The previous implementation which just called filepath.EvalSymlinks has
historically had issues on Windows. One of these issues we were able to
fix in Go, but EvalSymlinks's behavior is not well specified on
Windows, and there could easily be more issues in the future, so it
seems prudent to move to a separate implementation for Windows.

The new implementation uses the Windows GetFinalPathNameByHandle API,
which takes a handle to an open file or directory and some flags, and
returns the "real" name for the object. See comments in the code for
details on the implementation.

I have tested this change with a variety of mounts and everything seems
to work as expected. Functions that make incorrect assumptions on what a
Windows path can look like may have some trouble with the \\?\ path
syntax. For instance EvalSymlinks fails when given a \\?\UNC\ path. For
this reason, the resolvePath implementation modifies the returned path
to translate to the more common form (\\?\UNC\server\share ->
\\server\share).

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2021-05-04 11:55:11 -07:00
Enrico Weigelt, metux IT consult
9ea25634bd Makefile: allow overriding go command by environment
This is required for environments/build systems where a specific
go version / command needs to be used.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-05-04 20:39:47 +02:00
Fu Wei
cbdc094d33
Merge pull request #5445 from mikebrow/update-seccomp
update seccomp version
2021-05-05 00:33:14 +08:00
Akihiro Suda
c27cbc6617
Merge pull request #5436 from bwh-mind/ppc32
Update golang.org/x/sys to add linux/ppc support
2021-05-05 01:14:22 +09:00
Phil Estes
53e1577845
Merge pull request #5441 from thaJeztah/dont_loop_da_loop
go.mod: cut circular dependency on github.com/containerd/containerd
2021-05-04 10:40:26 -04:00
Mike Brown
c1a35232d8
Merge pull request #5446 from Random-Liu/fix-auth-config
Fix different registry hosts referencing the same auth config.
2021-05-04 06:21:02 -05:00