Commit Graph

2010 Commits

Author SHA1 Message Date
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
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
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
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
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
Mike Brown
8448b92d23
Merge pull request #1534 from crosbymichael/selinux-range
Update selinux pkg and allow category range to be set in config
2020-07-23 15:32:55 -05:00
Mike Brown
0443a13da7
Merge pull request #1535 from lumjjb/updatecri-doc
Update doc cri plugin convention
2020-07-23 11:18:44 -05:00
Mike Brown
e080f84537
Merge pull request #1539 from mikebrow/windows-ci-force-bash
switching to windows-2016.. latest is breaking due to wsl conflict with bash
2020-07-23 10:11:13 -05:00
Mike Brown
fad87288f8 switching to windows-2016 latest is breaking due to wsl conflict with bash
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-22 17:33:45 -05:00
Brandon Lum
f93b72530f Update doc cri plugin convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2020-07-22 17:34:17 +00:00
Michael Crosby
5f5d954b6a add selinux category range to config
This allows an admin to set the upper bounds on the category range for selinux
labels.  This can be useful when handling allocation of PVs or other volume
types that need to be shared with selinux enabled on the hosts and volumes.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 16:02:07 -04:00
Michael Crosby
9b06da4773 update selinux to 1.6.0 release
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 15:57:28 -04:00
Mike Brown
fcda0cf4a7
Merge pull request #1529 from AkihiroSuda/allow-disabling-hugepages
allow disabling hugepages
2020-07-16 13:29:46 -05:00
Akihiro Suda
707d2c49d1
allow disabling hugepages
This helps with running rootless mode + cgroup v2 + systemd without hugetlb delegation.
Systemd does not (and will not, perhaps) support hugetlb delegation as of systemd v245. https://github.com/systemd/systemd/
issues/14662

From 502bc5427e/src/patches/containerd/0001-DIRTY-VENDOR-cri-allow-disabling-hugepages.patch

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 11:46:25 +09:00
Mike Brown
1d3b9c5b80
Merge pull request #1532 from jsturtevant/update-pause-image-ref
Update to latest Windows SandboxImage
2020-07-15 17:55:28 -05:00
James Sturtevant
2bb0b19c4b Update to latest pause image for windows
Signed-off-by: James Sturtevant <jstur@microsoft.com>
2020-07-15 11:45:21 -07:00
Mike Brown
5df93a038a
Merge pull request #1531 from mikebrow/nit-for-default-config
show runc options tag
2020-07-11 11:47:00 -05:00
Mike Brown
4b3974c4e9 show runc options tag
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-10 16:33:36 -05:00
Mike Brown
a01750d89a
Merge pull request #1530 from hckuo/fix-doc-for-runtime-options
Fix doc for runtime specific options
2020-07-10 11:46:32 -05:00
HsuanChi (Austin) Kuo
904ab30f9d Fix doc for runtime specifc options
Signed-off-by: Hsuan-Chi Kuo <hckuo2@illinois.edu>
2020-07-10 11:04:49 -05:00
Mike Brown
0fa3cfd695
Merge pull request #1440 from jr-santos98/master
Containerd-Cri with supports multi-architectures
2020-07-08 20:29:03 -05:00
Junior Santos
c69a2dc745 Checking if a variable already exists
Signed-off-by: Junior Santos <claudio.dossantosjunior@yahoo.com.br>
2020-07-08 19:51:56 -03:00
Junior Santos
ecf335ad65 added multi-architectures support
Signed-off-by: Junior Santos <claudio.dossantosjunior@yahoo.com.br>
2020-07-07 02:51:12 -03:00
Wei Fu
8fb244a65b
Merge pull request #1525 from containerd/forcibly-remove-sandbox-container
Forcibly remove sandbox container
2020-07-05 18:00:38 +08:00
Mike Brown
0c45d13292 move up to latest cri-tools
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-04 17:08:48 -05:00
Mike Brown
5f50692d3d
Merge pull request #1524 from mikebrow/verbose-dco-check
set dco check to verbose
2020-07-04 16:42:52 -05:00
Mike Brown
4549b94eca gofmt cleanup
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-04 15:54:29 -05:00
Abhishek Kulkarni
287c52d1c6 Forcibly stop running containers before removal
Signed-off-by: Abhishek Kulkarni <abd.kulkarni@gmail.com>
2020-07-04 15:49:00 -05:00
Mike Brown
f427791c60 set dco check to verbose
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-04 15:34:27 -05:00
Mike Brown
aa0f4fd37b
Merge pull request #1521 from AkihiroSuda/revendor-libcontainer
vendor runc v1.0.0-rc91
2020-07-03 02:57:11 -05:00
Akihiro Suda
fb208d015a
vendor runc v1.0.0-rc91
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-03 14:03:21 +09:00
Mike Brown
1bc5ba3f48
Merge pull request #1519 from AkihiroSuda/config-fix-toml-tag
config: TolerateMissingHugePagesCgroupController -> TolerateMissingHugetlbController
2020-07-02 02:53:46 -05:00
Akihiro Suda
fe6833a9a4
config: TolerateMissingHugePagesCgroupController -> TolerateMissingHugetlbController
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-02 13:49:42 +09:00
Akihiro Suda
b69d7bdc5f
config: fix TOML tag for TolerateMissingHugePagesCgroupController
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-02 13:38:19 +09:00
Mike Brown
8e0b789c9a
Merge pull request #1520 from AkihiroSuda/fix-ci-apt-get-update
CI: run apt-get update befor apt-get install
2020-07-01 13:34:15 -05:00
Akihiro Suda
4049a912f3
CI: run apt-get update befor apt-get install
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-01 18:59:19 +09:00
Mike Brown
c2191fddd7
Merge pull request #1513 from brianpursley/state-name
Change "failed to stop sandbox" error message to use state name instead of numeric value
2020-06-27 16:08:27 -05:00
Brian Pursley
aa04fc9d53 Change "failed to stop sandbox" error message to use state name instead of numeric value
Signed-off-by: Brian Pursley <bpursley@cinlogic.com>
2020-06-27 16:45:08 -04:00
Mike Brown
09d6426f33
Merge pull request #1511 from kevpar/named-pipe-mounts
Support named pipe mounts for Windows containers
2020-06-25 15:31:38 -05:00
Kevin Parsons
210561a8e3 Support named pipe mounts for Windows containers
Adds support to mount named pipes into Windows containers. This support
already exists in hcsshim, so this change just passes them through
correctly in cri. Named pipe mounts must start with "\\.\pipe\".

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-06-25 12:01:08 -07:00
Mike Brown
682d158399
Merge pull request #1517 from mikebrow/fix-e2e-bucket
hard set kubernetes version not in vendor.conf anymore
2020-06-24 19:54:54 -05:00
Mike Brown
f5c7ac9272 fix for image pull linter change
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-06-24 18:10:31 -05:00
Mike Brown
05cd942875 hard set kubernetes version not in vendor.conf anymore
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-06-24 18:02:30 -05:00
Derek McGowan
98aadbbe56
Merge pull request #1463 from dims/remove-dependencies-on-k8s.io/kubernetes
Remove dependencies on k8s.io/kubernetes
2020-06-23 10:21:13 -07:00
Davanum Srinivas
3ee62de2bf
remove unused method
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 15:03:47 -04:00