github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
2,071 Commits 3 Branches 2 Tags 112 MiB
a0b3b4e4da
Commit Graph

2071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
a0b3b4e4da
Merge pull request #1593 from moolen/fix/add-nri-labels 
Add missing sandbox labels when invoking nri
 2020-10-07 13:17:06 -04:00
Phil Estes
bc08a19f3a
Merge pull request #1595 from dmcgowan/fix-unix-lint 
Fix unix lint
 2020-10-06 08:37:01 -04:00
Derek McGowan
6f98abc2a6 Add macos target for lint 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-05 17:46:01 -07:00
Derek McGowan
07c98d0bf1 Fix lint in Unix environments 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-05 17:46:01 -07:00
Moritz Johner
f87302ab20 Add missing sandbox labels when invoking nri plugins 
Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
 2020-10-03 23:30:09 +02:00
Mike Brown
d620c30d7e
Merge pull request #1592 from dmcgowan/stricter-lint 
Align lint with containerd
 2020-10-01 14:53:36 -05:00
Derek McGowan
77cf032195 Enable golangci on Windows 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-01 09:01:16 -07:00
Mike Brown
07cc1af22d
Merge pull request #1591 from hickeyma/impr-img-reg-doc 
Doc (registry): Update to the image registry doc
 2020-10-01 10:43:08 -05:00
Derek McGowan
a3c0e8859c Align lint checks with containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-09-30 23:17:46 -07:00
Derek McGowan
83e6efc6fc Use tabs in protofile indentation 
This is enforced as part of containerd's fmt checks

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-09-30 21:50:33 -07:00
Martin Hickey
fe5fdccdaf Update after review 
Review comments:
- https://github.com/containerd/cri/pull/1591#pullrequestreview-499636859

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-09-30 19:00:08 +00:00
Martin Hickey
70a56ae327 Updates to the image registry doc 
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-09-30 14:51:59 +00:00
Mike Brown
2e3bebb297
Merge pull request #1583 from thaJeztah/simplify_ensure_removeall_windows 
pkg/server: make ensureRemoveAll() an alias for os.RemoveAll() on Windows
 2020-09-28 14:26:18 -05:00
Mike Brown
6d2731834c
Merge pull request #1587 from thaJeztah/bump_containerd_v1.4.1 
vendor: containerd/containerd v1.4.1
 2020-09-24 17:29:44 -05:00
Sebastiaan van Stijn
9f61affa09
vendor: containerd/containerd v1.4.1 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-24 23:25:07 +02:00
Mike Brown
c988d797be
Merge pull request #1372 from cofyc/update-config-syntax 
update config syntax in registry.md
 2020-09-24 15:59:56 -05:00
Mike Brown
2c2dd59f32
Merge branch 'master' into update-config-syntax 2020-09-24 15:58:39 -05:00
Mike Brown
b3678ddad2
Merge pull request #1562 from dims/update-to-latest-k8s-1.19.0-release 
Update to latest k8s 1.19.2 release
 2020-09-24 15:46:28 -05:00
Mike Brown
b1ee4c0d7b
Merge pull request #1570 from yoheiueda/masked 
Set masked and readonly paths based on default Unix spec
 2020-09-24 15:45:58 -05:00
Mike Brown
c178043f6b
Merge pull request #1584 from containerd/revert-1530-fix-doc-for-runtime-options 
Revert "Fix doc for runtime specific options"
 2020-09-22 09:09:50 -05:00
Akihiro Suda
0762fdd9e2
Revert "Fix doc for runtime specific options" 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-09-22 17:23:19 +09:00
Sebastiaan van Stijn
e2928124d1
pkg/server: make ensureRemoveAll() an alias for os.RemoveAll() on Windows 
The tricks performed by ensureRemoveAll only make sense for Linux and
other Unices, so separate it out, and make ensureRemoveAll for Windows
just an alias of os.RemoveAll.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-22 10:11:46 +02:00
Davanum Srinivas
da4a8aea15
Update to latest kubernetes v1.19.2 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-09-17 12:37:19 -04:00
Michael Crosby
210a86ca5b
Merge pull request #1578 from thaJeztah/bitset_1.1.11 
vendor: github.com/willf/bitset v1.1.11
 2020-09-15 14:43:49 -04:00
Mike Brown
ffe79709e4
Merge pull request #1572 from ktock/layers 
Limit size of additional annotation for avoiding unpack failure
 2020-09-15 11:50:52 -05:00
Sebastiaan van Stijn
407c3eba2e
vendor: github.com/willf/bitset v1.1.11 
The changes needed by opencontainers/selinux are now in a tagged
release. This will make our dependency slightly ahead of what's
used by opencontainers/selinux until a v1.6.1 is tagged.

full diff: https://github.com/willf/bitset/compare/d5bec3311243...v1.1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-15 17:59:09 +02:00
ktock
e571fd864f Limit value size of additional annotation for avoiding unpack failure 
In containerd, there is a size limit for label size (4096 chars).
Currently if an image has many layers (> (4096-39)/72 > 56),
`containerd.io/snapshot/cri.image-layers` will hit the limit of label size and
the unpack will fail.
This commit fixes this by limiting the size of the annotation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-09-15 22:47:28 +09:00
Phil Estes
109853ace2
Merge pull request #1577 from vteratipally/master 
Make script work for both python2.7 and 3.6
 2020-09-15 08:47:32 -04:00
varsha teratipally
bf3dcfe3a8 Make script work for both python2.7 and 3.6 
Signed-off-by: Varsha Teratipally <teratipally@google.com>
 2020-09-15 00:29:12 +00:00
Wei Fu
a536d06cba
Merge pull request #1573 from mikebrow/update-cni-config 
update cni config version
 2020-09-12 11:32:20 +08:00
Mike Brown
53cdd2e0c3 update cni config version 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-09-11 14:36:42 -05:00
Mike Brown
14c861cf33
Merge pull request #1571 from kinvolk/mauricio/update-slack-link 
README: Update slack reference to CNCF
 2020-09-10 13:55:42 -05:00
Mauricio Vásquez
a07a37558d README: Update slack reference to CNCF 
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
 2020-09-09 17:55:27 -05:00
Yohei Ueda
b582da4438
Set masked and readonly paths based on default Unix spec 
The default values of masked and readonly paths are defined
in populateDefaultUnixSpec, and are used when a sandbox is
created.  It is not, however, used for new containers.  If
a container definition does not contain a security context
specifying masked/readonly paths, a container created from
it does not have masked and readonly paths.

This patch applies the default values to masked and
readonly paths of a new container, when any specific values
are not specified.

Fixes #1569

Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
 2020-09-09 23:13:05 +09:00
Derek McGowan
35e623e6bf
Merge pull request #1561 from crosbymichael/kata-se 
Handle KVM based runtimes with selinux
 2020-09-01 13:12:11 -07:00
Michael Crosby
d715d00906 Handle KVM based runtimes with selinux 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-26 21:38:03 -04:00
Derek McGowan
56a89cda34
Merge pull request #1552 from crosbymichael/nri 
Add experimental NRI injection points
 2020-08-24 13:58:11 -07:00
Mike Brown
d09e26b0a0
Merge pull request #1556 from aojea/cni80 
bump cni dependencies
 2020-08-24 13:12:24 -05:00
Antonio Ojea
1403a391c3 bump cni dependencies 
Signed-off-by: Antonio Ojea <aojea@redhat.com>
 2020-08-21 18:00:20 +02:00
Mike Brown
bb0ca842e9
Merge pull request #1559 from mikebrow/prepare-1.4 
Prepare 1.4
 2020-08-20 12:16:29 -05:00
Michael Crosby
63f89eb954 Update server with nri injection points 
This allows development with container to be done for NRI without the need for
custom builds.

This is an experimental feature and is not enabled unless a user has a global
`/etc/nri/conf.json` config setup with plugins on the system.  No NRI code will
be executed if this config file does not exist.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-20 08:10:09 -04:00
Michael Crosby
b777982928 Update vendor for new containerd and nri 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-20 07:28:37 -04:00
Mike Brown
b0cc07999a vendor containerd 1.4 release 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-20 05:14:45 -05:00
Mike Brown
a40d639285 update support table for 1.4 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-20 05:13:47 -05:00
Akihiro Suda
4e6644c8cf
Merge pull request #1551 from thaJeztah/bump_kubernetes_1.19.0-rc.4 
vendor: kubernetes 1.19.0 rc.4 and dependencies
 2020-08-10 19:18:50 +09:00
Akihiro Suda
0619de413c
Merge pull request #1555 from thaJeztah/bump_golang_1.13.15 
Bump Golang 1.13.15
 2020-08-09 03:00:33 +09:00
Sebastiaan van Stijn
34596c9c90
Bump Golang 1.13.15 
full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15

go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary
package. See the Go 1.13.15 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.15+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-08 15:10:30 +02:00
Mike Brown
5c6c6b2ac7
Merge pull request #1550 from thaJeztah/bump_containerd_v1.4.0-rc.0 
Bump containerd v1.4.0 rc.0
 2020-08-05 17:56:08 -05:00
Mike Brown
a8b6b6b065
Merge pull request #1549 from thaJeztah/bump_golang_1.13.14 
Bump Golang 1.13.14
 2020-08-05 10:15:48 -05:00
Sebastiaan van Stijn
ecbdffc9c5
vendor: update kubernetes v1.19.0-rc.4 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-05 15:48:45 +02:00