Michael Crosby
2e442ea485
[cri] ensure log dir is created
...
containerd is responsible for creating the log but there is no code to ensure
that the log dir exists. While kubelet should have created this there can be
times where this is not the case and this can cause stuck tasks.
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-12-17 15:04:39 -05:00
Maksym Pavlenko
3cd1c832ef
Merge pull request #4796 from jsj/jsj/4572
...
Mention built-in CRI support in README
2020-12-16 20:14:13 -08:00
Maksym Pavlenko
a5f9613b83
Merge pull request #3927 from katiewasnothere/snapshotter_check
...
add check that snapshotter supports the image platform when unpacking
2020-12-16 14:25:08 -08:00
Akihiro Suda
318e34b983
Merge pull request #4855 from tonistiigi/push-concurrent-access
...
docker: avoid concurrent map access panic
2020-12-16 22:35:33 +09:00
Akihiro Suda
7fa02f3afb
Merge pull request #4854 from tonistiigi/fix-push-auth
...
pusher: add missing authentication support for requests
2020-12-16 22:35:10 +09:00
Tonis Tiigi
4dfec7fa01
pusher: add missing authentication support for requests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-15 22:26:59 -08:00
Tonis Tiigi
bf323c5bdd
docker: avoid concurrent map access panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-15 22:26:26 -08:00
Phil Estes
e922d5553d
Merge pull request #4849 from AkihiroSuda/remove-selinux-tag
...
remove "selinux" build tag
2020-12-15 14:32:53 -05:00
Phil Estes
0c0ff6efc4
Merge pull request #4850 from wangmaodou/update-runc-doc
...
Update RUNC.md
2020-12-15 10:51:09 -05:00
maodou
b197a66f40
docs: update RUNC.md
...
Signed-off-by: maodou <maodou404@gmail.com>
2020-12-15 21:42:36 +08:00
Akihiro Suda
7e6e4c466f
remove "selinux" build tag
...
The build tag was removed in go-selinux v1.8.0: opencontainers/selinux#132
Related: remove "apparmor" build tag: 0a9147f3aa
2020-12-15 20:05:25 +09:00
Simon Kaegi
da2fd657ab
Add bounds on max oom_score_adj value for AdjustOOMScore
...
oom_score_adj must be in the range -1000 to 1000. In AdjustOOMScore if containerd's score is already at the maximum value we should set that value for the shim instead of trying to set 1001 which is invalid.
Signed-off-by: Simon Kaegi <simon_kaegi@ca.ibm.com>
2020-12-14 15:09:24 -05:00
Michael Crosby
23315f8647
Merge pull request #4840 from AkihiroSuda/with-container-labels-2
...
container_opts.go: add WithAdditionalContainerLabels
2020-12-14 14:53:03 -05:00
Michael Crosby
a9cc801922
Merge pull request #4821 from mxpv/tests
...
Enable devmapper tests
2020-12-14 14:52:08 -05:00
Michael Crosby
d1ced4f8ae
Merge pull request #4833 from AkihiroSuda/restart-with-log-uri
...
restart: allow passing existing log URI object
2020-12-14 14:48:37 -05:00
Michael Crosby
5d147bdc42
Merge pull request #4842 from AkihiroSuda/expose-fs-user-util
...
oci: expose getUserFromPath and getGIDFromPath
2020-12-14 14:46:54 -05:00
Akihiro Suda
8a57d70a50
oci: expose getUserFromPath and getGIDFromPath
...
These functions are planned to be used for implementing `nerdctl exec --user`.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-14 21:53:17 +09:00
Akihiro Suda
041eb3ac31
container_opts.go: add WithAdditionalContainerLabels
...
WithAdditionalContainerLabels() preserves the existing entries in c.Labels.
OTOH, WithContainerLabels() clears them.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-14 16:44:47 +09:00
James Jackson
ca292da14b
Requested Changes
...
* Consolidating and improving language
Signed-off-by: James Jackson <james.sorley.jackson@gmail.com>
2020-12-12 15:22:38 -06:00
James Jackson
09241fd21c
Mention built-in CRI support in README
...
Signed-off-by: James Jackson <james.sorley.jackson@gmail.com>
2020-12-12 15:22:38 -06:00
Akihiro Suda
0356d5d4b2
restart: allow passing existing log URI object
...
The new function `WithLogURI(uri *url.URL)` replaces `WithBinaryLogURI(binary string, args map[string]string)`
so as to allow passing an existring URI object.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-12 05:11:03 +09:00
Maksym Pavlenko
004214808a
Merge pull request #4831 from AkihiroSuda/expose-contents-showprogress
...
ctr/commands/contents: expose ShowProgress
2020-12-11 11:04:49 -08:00
Maksym Pavlenko
c9c1f5cc58
Merge pull request #4832 from AkihiroSuda/expose-apparmor-loaddefault
...
contrib/apparmor: expose LoadDefaultProfile
2020-12-11 11:04:09 -08:00
Phil Estes
fad0ca2612
Merge pull request #4822 from samuelkarp/freebsd
...
Build on FreeBSD
2020-12-11 08:30:03 -05:00
Akihiro Suda
7b04b3cbb6
contrib/apparmor: expose LoadDefaultProfile
...
Expected to be used by nerdctl: 6026ae740a/internal_oci_hook.go (L170-L180)
2020-12-11 19:59:51 +09:00
Akihiro Suda
419ad73727
ctr/commands/contents: expose ShowProgress
...
Expected to be used by nerdctl
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-11 19:53:44 +09:00
Samuel Karp
4bcfbfe663
ci: add cross-compile for FreeBSD
...
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-10 21:41:34 -08:00
Kathryn Baldauf
f8992f451c
add optional check that snapshotter supports the image platform when unpacking
...
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-12-10 10:54:22 -08:00
Maksym Pavlenko
da68609866
Fix devmapper test
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-12-09 09:35:17 -08:00
Maksym Pavlenko
5a26a03691
Enable devmapper tests on CI
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-12-09 09:34:31 -08:00
Maksym Pavlenko
2b87d4554f
Add retries when deleting a devmapper device
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-12-09 09:13:34 -08:00
Wei Fu
7b0149ac4a
Merge pull request #4820 from AkihiroSuda/additional-pull-opts
...
ctr: FetchConfig: allow setting additional []containerd.RemoteOpt
2020-12-10 00:38:59 +08:00
Samuel Karp
b459209188
Compile for FreeBSD
...
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-09 00:30:29 -08:00
Samuel Karp
51f9eafd10
vendor: update continuity for FreeBSD support
...
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2020-12-09 00:30:27 -08:00
Akihiro Suda
1febce4ca8
ctr: FetchConfig: allow setting additional []containerd.RemoteOpt
...
The additional []containerd.RemoteOpt is not used by ctr currently,
but planned to be used by nerdctl and also probably by stargz's ctr-remote.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-09 16:12:13 +09:00
Phil Estes
1e624fa3de
Merge pull request #4815 from AkihiroSuda/remove-apparmor-tag
...
remove "apparmor" build tag
2020-12-08 09:11:17 -05:00
Akihiro Suda
0a9147f3aa
remove "apparmor" build tag
...
The "apparmor" build tag does not have any cgo dependency and can be removed safely.
Related: https://github.com/opencontainers/runc/issues/2704
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-08 19:22:39 +09:00
Mike Brown
6467c3374d
refactor based on comments
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-12-07 21:39:31 -06:00
Phil Estes
46e1dc5a9f
Merge pull request #4809 from giuseppe/zstd-support
...
compression: add support for the zstd algorithm
2020-12-07 12:43:32 -05:00
Phil Estes
73a301c7a1
Merge pull request #4772 from gaurav1086/ValidatePluginConfig_fix_range_iterator_issue
...
[cri/config] : fix range iterator issue in ValidatePluginConfig
2020-12-07 12:42:07 -05:00
Phil Estes
efad13faaf
Merge pull request #4811 from AkihiroSuda/expose-apparmor
...
expose hostSupportsAppArmor()
2020-12-07 08:22:16 -05:00
Phil Estes
9f97514f97
Merge pull request #4803 from ungureanuvladvictor/vladu/json-logging
...
Allow configuration of different log formats: text, json
2020-12-07 08:21:01 -05:00
Akihiro Suda
55eda46b22
expose hostSupportsAppArmor()
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-07 19:12:59 +09:00
Giuseppe Scrivano
30802fac73
compression: add support for the zstd algorithm
...
zstd is a compression algorithm that has a very fast decoder, while
providing also good compression ratios. The fast decoder makes it
suitable for container images, as decompressing the tarballs is a very
expensive operation.
https://github.com/opencontainers/image-spec/pull/788 added support
for zstd to the OCI image specs.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-12-07 09:56:30 +01:00
Derek McGowan
9c398e1cb2
Merge pull request #4395 from TBBle/use_gowinio_for_reading_tarballs
...
Use go-winio for applying tarballs
2020-12-06 12:18:06 -08:00
Gaurav Singh
071a185506
cri/config: fix range iterator issue in ValidatePluginConfig
...
Go uses the same address variable while iterating in a range,
so use a copy when using its address.
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
2020-12-04 17:37:09 -05:00
Mike Brown
b4727eafbe
adding code to support seccomp apparmor securityprofile
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-12-04 15:15:32 -06:00
Mike Brown
f1295043eb
vendor commit for cri api changes
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-12-04 15:15:32 -06:00
Phil Estes
e98d7f8eaa
Merge pull request #4808 from dmcgowan/update-continuity
...
Update continuity
2020-12-04 16:08:28 -05:00
Derek McGowan
41da96d670
Update continuity
...
Pickup usage calculation fix
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-12-04 11:49:26 -08:00
