github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
6,094 Commits 3 Branches 4 Tags
e9f94064b9616ab36a8a51d632a63f97f7783c3d
Commit Graph

6094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
e9f94064b9 Merge pull request #4469 from dmcgowan/update-1.4.0-rc.1 
Update version for 1.4.0-rc.1
 2020-08-11 16:08:09 -07:00
Phil Estes
790c131cf4 Merge pull request #4465 from dmcgowan/github-release-cri 
GitHub actions release of CRI tarball
 2020-08-11 17:47:04 -04:00
Derek McGowan
41469ed72b Update version for 1.4.0-rc.1 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 14:41:22 -07:00
Akihiro Suda
f0c50967fb Merge pull request #4466 from thaJeztah/bump_cri2 
vendor: containerd/cri 4e6644c8cf and dependencies
 2020-08-12 01:27:16 +09:00
Derek McGowan
60fa35f11e Fix DCO commit limit 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:16:41 -07:00
Derek McGowan
d2472ecc59 Add CRI release build 
Add installation scripts needed to generate CRI + CNI tar package on
release.
Update Github action release script to generate CRI release tarballs for
Linux and Windows.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:16:38 -07:00
Derek McGowan
1c7312e5da Update containerd systemd unit file 
Synchronizes unit file with CRI's version

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:15:12 -07:00
Lantao Liu
ccda537604 Create etcd user in cloud init. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Mike Brown
e973719ccf use containerd/project header test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
cb7ffd4b0b Fix indent in cni.template. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
3e03ba7aa2 Update deployment and integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
9c54517920 Add TaskMax=infinity 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
523b0b3c61 Remove noSnat 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
231d291b2d Use v2 config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
1e1688d211 Use per-pod shim. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
87bd84a7bb Add DefaultRuntimeName option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
cfab98a5fd Use ctr images import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
5e3ac16cc6 Add cri as required plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
5b9d8476ea Use runc.v1 for now for debugging. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
e6e272e740 Enable runc.v2 as the default runtime in test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
d19aa0fd2e Use local env to avoid writing to passed-in readonly env. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
ee6d69bbc1 Set default "" to extra runtime handler. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
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