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

6066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Allclair
474c79bd52
Expose vars to configure an additional runtime handler 
Expose environment variables in the GCE containerd configuration
script for configuring an additional runtime handler. This unblocks
E2E testing of custom runtime handlers.

Signed-off-by: Tim Allclair <tallclair@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
ce12477f47
Support docker 18.09 in the test script. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
1467121010
Remove the unused health-monitor.sh. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
201ad4d3c4
Support netd in GCE bootstrap. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
5ce7057502
Serve streaming on localhost by default to match k8s 1.11 default. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
b553fdaf31
Remove crictl on GCE for all cases. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
d8ce08fd92
Set stream server to serve on localhost on GCE. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
1629bab7f9
Make max container log line size configurable through cloud init. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
042378dcf1
Disable TLS streaming to work with new kubelet streaming proxy. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:09 -07:00
Bingshen Wang
37f2ecad97
Update cni.template 
Format the cni.template, use `space` instead of some `tab`. Avoid indent issue in text editor.

Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2020-08-11 09:15:09 -07:00
Lantao Liu
b58b6fef86
Disable restart plugin on GCE. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
f938a166cd
Fix kube-container-runtime-monitor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
91f8e61bd3
Use crictl installed in kube-up.sh 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
5161f663e4
Add unix:// prefix for socket addresses used by CRI remote client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
1b995fcaf2
Add KUBE_CONTAINER_RUNTIME_NAME to fix fluentd support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
48457a254e
Try using preloaded containerd if no version is specified. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
c67a38b0b5
Add log level support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
4453aac005
Improve gce bootstrapping in various ways. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:08 -07:00
Lantao Liu
1bd3cdc572
Add cni config template support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
d520fac508
Enable TLS streaming in all the setup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
cdb4aec93a
Use systemd service cgroup and oom score adj. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
af8bd80689
Fix for kube-up.sh and update several documments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
005da4a9b9
Replace ctrcri with ctr cri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
0e2bd216ce
Update GCE cluster bootstrapping and e2e test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
59e65e1f37
Enable container log rotation. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
85b4e69c9f
Do not block on stream server close. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
2ea6584ca7
Add initial wait for health-monitor and use pkill -x. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:07 -07:00
Lantao Liu
56b7ef2c4d
The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Mike Brown
24a3a0a068
change crictl sandboxes to pods; other references to sandboxes 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
8bc30e7a2e
Update ocicni to main stream. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
a010715584
Add a separate CLI for cri-containerd ctrcri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
a843a30645
Use registry-1.docker.io as backup 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
ec649079a9
Put version into metadata so that version won't be changed across 
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
7cbc1c8dc3
Set registry mirror. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
9f0816ac43
Configure container runtime cgroups for cgroup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:06 -07:00
Lantao Liu
be72f47ec9
Add runtime cgroup and fix a cli panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Lantao Liu
680e21c430
Update all glog flags to log-level. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Lantao Liu
d50b9dd64c
Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Lantao Liu
869ea6b0c8
Add document for kube-up.sh 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Lantao Liu
30cbfb62ec
Add OS and arch in release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Lantao Liu
0512d1e0b2
Add cluster directory and health-monitor.sh. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:05 -07:00
Akihiro Suda
8a3f1c99e0
Merge pull request #4451 from dweomer/test-selinux 
Update Vagrantfile for testing SELinux
 2020-08-11 20:05:03 +09:00
Derek McGowan
4252d2c9b1
Merge pull request #4461 from AkihiroSuda/update-rootless-doc 
update docs/rootless.md
 2020-08-10 23:46:32 -07:00
Derek McGowan
269633f72e
Merge pull request #4459 from AkihiroSuda/runc-rc92 
update runc to v1.0.0-rc92
 2020-08-10 23:45:43 -07:00
Jacob Blain Christen
b4376e9865 Update Vagrantfile for testing SELinux 
`vagrant up` will build and install containerd and all dependencies,
setting up proper SELinux contexts on the runc and containerd binaries.
The VM is configured to be SELinux Enforcing by default but this gets
changed during various CI passes via a matrix param to Disabled and
Permissive before running tests. I have an open PR to fix the
container-selinux policy for containerd at
https://github.com/containers/container-selinux/pull/98 which once
accepted we will want to update the CI matrix to use Enforcing mode
instead of Permissive.

All tests currently pass in SELinux permissive mode with containerd
configured with `enable_selinux=true`. To see which tests are failing
with SELinux enforcing and an already spun up VM:
`SELINUX=Enforcing vagrant up --provision-with=selinux,test-cri`
To test SELinux enforcing in a new VM:
`vagrant destroy -force; SELINUX=Enforcing vagrant up --provision-with=shell,selinux,test-cri`

The `selinux` shell provisioner, parameterized by the SELINUX envvar,
will configure the system as you would expect, with the side effect that
containerd is configured with `enable_selinux=true` via
`/etc/containerd/config.toml` for Permissive or Enforcing modes and
`enable_selinux=false` when SELINUX=Disabled.

Provided that virtualization is suported, this Vagrantfile and provisioners
make it easy to test containerd/cri for conformance under SELinux on
non-SELinux systems.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-08-10 01:55:44 -07:00
Wei Fu
23934e8686
Merge pull request #4462 from thaJeztah/bump_golang_1.13.15 
Bump Golang 1.13.15
 2020-08-09 10:41:37 +08:00
Sebastiaan van Stijn
55c9eade39
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:07:28 +02:00
Akihiro Suda
e3e2c39462
update docs/rootless.md 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-08 04:08:35 +09:00
Akihiro Suda
8433602989
update runc to v1.0.0-rc92 
Changes: https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc92

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-06 20:31:33 +09:00
Akihiro Suda
3cdc7bf13d
Merge pull request #4457 from thaJeztah/bump_cri_tools 
Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
 2020-08-06 09:21:39 +09:00