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

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
7ce8a9d7d3
Merge pull request #4204 from ashrayjain/aj/add-kill-retry 
Make killing shims more resilient
 2020-06-03 11:10:43 -04:00
Phil Estes
7121969f2d
Merge pull request #4296 from dims/revendor-containerd-cri-for-tolerating-hugepages-cgroup 
Revendor CRI to 62c91260d2
 2020-06-03 09:35:46 -04:00
Ashray Jain
3e95727f39 Make killing shims more resilient 
Currently, we send a single SIGKILL to the shim process
once and then we spin in a loop where we use kill(pid, 0)
to detect when the pid has disappeared completely.

Unfortunately, this has a race condition since pids can be reused causing us
to spin in an infinite loop when that happens.

This adds a timeout to this loop which logs a warning and exits the
infinite loop.

Signed-off-by: Ashray Jain <ashrayj@palantir.com>
 2020-06-03 12:57:08 +01:00
Davanum Srinivas
e64b14820e
Revendor CRI to 62c91260d2 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-02 15:27:39 -04:00
Mike Brown
62c91260d2
Merge pull request #1501 from dims/tolerate-missing-hugetlb-cgroups-controller 
Tolerate missing HugeTLB cgroups controller
 2020-06-02 10:53:40 -05:00
Derek McGowan
3dd8242a67
Add host specific headers 
Allows configuring headers per registry host

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-06-01 18:27:41 -07:00
Michael Crosby
62dd14114d
Merge pull request #4273 from AkihiroSuda/oomv2 
cgroup2: implement `containerd.events.TaskOOM` event
 2020-06-01 12:51:34 -04:00
Davanum Srinivas
d7ce093d63
Tolerate missing HugeTLB cgroups controller 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-01 12:07:32 -04:00
Akihiro Suda
2f601013e6 cgroup2: implement containerd.events.TaskOOM event 
How to test (from https://github.com/opencontainers/runc/pull/2352#issuecomment-620834524):
  (host)$ sudo swapoff -a
  (host)$ sudo ctr run -t --rm --memory-limit $((1024*1024*32)) docker.io/library/alpine:latest foo
  (container)$ sh -c 'VAR=$(seq 1 100000000)'

An event `/tasks/oom {"container_id":"foo"}` will be displayed in `ctr events`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-01 14:00:13 +09:00
Phil Estes
d9809bbbe0
Merge pull request #4293 from mxpv/revendor 
Revendor CRI to 8898550e34
 2020-05-29 18:41:54 -04:00
Maksym Pavlenko
62fd1750e2 Revendor CRI to 8898550e34 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-29 14:34:27 -07:00
Michael Crosby
8898550e34
Merge pull request #1498 from mxpv/base 
Specify base OCI runtime spec
 2020-05-29 16:34:29 -04:00
Maksym Pavlenko
17c61e36cb Fix cgroups path for base OCI spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-29 11:40:12 -07:00
Wei Fu
4b5d7f66c9
Merge pull request #4290 from mxpv/ctr-oci 
Add ctr subcommand to print default OCI spec
 2020-05-29 10:45:36 +08:00
Derek McGowan
be23b965e4
Merge pull request #4291 from estesp/fix-release-markdown-length 
Don't inadvertently clip release notes
 2020-05-28 16:10:49 -07:00
Phil Estes
2bc4e90f6f
Don't inadvertently clip release notes 
Specify a much larger linecount for extracting tag annotation from git.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-28 17:54:08 -04:00
Maksym Pavlenko
df8d6c5b7b Update documentation for base OCI spec files 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 14:45:11 -07:00
Maksym Pavlenko
636c533d95 Add ctr subcommand to print default OCI spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 14:06:44 -07:00
Maksym Pavlenko
8d54f39753 Allow specify base OCI runtime spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 13:39:31 -07:00
Phil Estes
8e9ba8376e
Merge pull request #4271 from cpuguy83/actions_add_windows_integration 
Move windows CI to actions
 2020-05-28 11:40:29 -04:00
Akihiro Suda
27f1e0d9ed
Merge pull request #4283 from hs0210/work 
Add unit test for func in remotes/docker/handler.go
 2020-05-29 00:25:41 +09:00
Phil Estes
137abe4ef9
Merge pull request #4282 from estesp/add-release-action 
Add release GH Action triggered by signed tag
 2020-05-28 11:12:08 -04:00
Michael Crosby
77bc753024
Merge pull request #4289 from dmcgowan/next-1.4-beta 
Update release notes for 1.4.0-beta.1
 2020-05-28 10:49:40 -04:00
Mike Brown
c7f25cb3ae
Merge pull request #1490 from mikebrow/document-gcr-json-key-auth 
add a registry auth tutorial
 2020-05-28 08:49:52 -05:00
Mike Brown
83b115af16
Merge pull request #1497 from mikebrow/add-commit-sha-to-log 
would like to have the commit sha in the log file names
 2020-05-28 08:48:53 -05:00
Hu Shuai
230cf6deda Add unit test for func in remotes/docker/handler.go 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2020-05-28 16:54:33 +08:00
Mike Brown
e8148bb49b would like to have the commit sha in the logs 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-05-27 17:47:43 -05:00
Maksym Pavlenko
f8380958c1
Merge pull request #1496 from mikebrow/variable-cri-tools-version 
add support for setting CRITOOL_VERSION
 2020-05-27 15:16:34 -07:00
Phil Estes
bb2b2825b6
Add release GH Action triggered by signed tag 
This will check that the tag is signed and then checkout the tag, build
official binaries, sha256sum the tarball, and upload those assets to the
release, officially generating a release in GitHub from the signed tag.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-27 16:56:13 -04:00
Derek McGowan
8f1ddb1428
Update release for 1.4.0-beta.1 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-27 13:42:02 -07:00
Maksym Pavlenko
26f7df1466
Merge pull request #4288 from crosbymichael/cri-bump 
Update CRI to 52c2c6b5df
 2020-05-27 11:33:12 -07:00
Brian Goff
c376f4f763 Move Windows testing to GH Actions 
This eliminates the need for appveyor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-05-27 10:45:22 -07:00
Brian Goff
3226283470 Fix client tests to work on Windows. 
- Powershell is no longer available in nanoserver, so change commands to
  run accordingly.
- Set platform specific commands for short and long running containers
- Skips 2 tests which do not run on Windows.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-05-27 10:42:23 -07:00
Michael Crosby
c744b66a3b
Merge pull request #1495 from crosbymichael/cni-bump 
Use go-cni tag
 2020-05-27 12:28:38 -04:00
Mike Brown
b97a2f33b0 add support for setting CRITOOL_VERSION 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-05-27 11:16:23 -05:00
Phil Estes
f0f49c6cab
Merge pull request #4284 from jmillikin-stripe/cli-tls-flags 
Add `ctr` flags for configuring default TLS credentials for registry
 2020-05-27 09:59:58 -04:00
John Millikin
b8ccdcb07d
Add ctr flags for configuring default TLS credentials. 
Signed-off-by: John Millikin <jmillikin@stripe.com>
 2020-05-27 21:59:33 +09:00
Derek McGowan
52c2c6b5df
Merge pull request #1494 from MHBauer/docs-moved 
docs moved
 2020-05-26 18:48:07 -07:00
Michael Crosby
c5273930bd Update CRI to 52c2c6b5df 
This bump contains updates for CRI with selinux support.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-05-26 21:06:18 -04:00
Morgan Bauer
5877716621
docs moved 
- to sig-node
 - to sig-testing

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2020-05-26 16:46:09 -07:00
Michael Crosby
477b31ce04 Use go-cni tag 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-05-26 19:32:03 -04:00
Derek McGowan
129bdd7a3d
Merge pull request #1487 from crosbymichael/selinux 
Add SELinux Support for CRI
 2020-05-26 15:53:18 -07:00
Phil Estes
dea6229923
Merge pull request #1491 from thaJeztah/bump_selinux 
vendor: opencontainers/selinux v1.5.2
 2020-05-26 16:49:28 -04:00
Michael Crosby
72edf3016d Use new SELinux APIs 
This moves most of the API calls off of the `labels` package onto the root
selinux package.  This is the newer API for most selinux operations.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-05-26 15:18:46 -04:00
Sebastiaan van Stijn
0b3c7e1479
vendor: opencontainers/selinux v1.5.2 
full diff: https://github.com/opencontainers/selinux/compare/v1.5.1...v1.5.2

- Implement FormatMountLabel unconditionally
  Implementing FormatMountLabel on situations built without selinux
  should be possible; the context will be ignored if no SELinux is available.
- Remote potential race condition, where mcs label is freed
  Theorectially if you do not change the MCS Label then we free it and two
  commands later reserve it. If some other process was grabbing MCS Labels
  at the same time, the other process could get the same label.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-26 16:30:35 +02:00
Mike Brown
a7ad3bc01f add a registry auth tutorial 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-05-22 15:39:30 -05:00
Maksym Pavlenko
4cbf59db82
Merge pull request #4279 from AkihiroSuda/ci-cgroup2 
cgroup2 CI
 2020-05-21 13:35:49 -07:00
Akihiro Suda
af131d7258 cgroup2 CI 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-05-22 01:15:12 +09:00
Derek McGowan
1c58c5d440
Merge pull request #4277 from lucaskanashiro/fix-build-on-riscv64 
riscv64 arch does not support -buildmode=pie
 2020-05-20 12:46:50 -07:00
Lucas Kanashiro
e34bf08e58 riscv64 arch does not support -buildmode=pie 
Signed-off-by: Lucas Kanashiro <lucas.kanashiro@canonical.com>
 2020-05-20 16:28:10 -03:00