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

6227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastiaan van Stijn
a1736f98a5 vendor: containerd/cri 4e6644c8cf 
full diff: 8871d5cdf8...4e6644c8cf

- Bump Golang 1.13.15
- Bump containerd v1.4.0 rc.0
- vendor: kubernetes 1.19.0 rc.4 and dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 10:11:05 +02:00
Sebastiaan van Stijn
15fa7f3787 vendor: update kubernetes v1.19.0-rc.4 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 10:05:56 +02:00
Sebastiaan van Stijn
4a0ac319ca vendor: golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 
full diff: 9dae0f8f57...ed371f2e16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 09:57:43 +02:00
Sebastiaan van Stijn
f80b4dc586 vendor: golang.org/x/net v0.0.0-20200707034311-ab3426394381 
full diff: f3200d17e0...ab34263943

Worth mentioning that there's a comment updated in golang.org/x/net/websocket:

    This package currently lacks some features found in alternative
    and more actively maintained WebSocket packages:
        https://godoc.org/github.com/gorilla/websocket
        https://godoc.org/nhooyr.io/websocket

It's used in k8s.io/apiserver/pkg/util/wsstream/stream.go, so perhaps that should
be reviewed if the alternatives are better for how it's used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 09:57:41 +02:00
Sebastiaan van Stijn
5a9a6a145e vendor: golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 
full diff: bac4c82f69...75b288015a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 09:57:39 +02:00
Sebastiaan van Stijn
aa40ebb417 vendor: json-iterator/go v1.1.10 
full diff: https://github.com/json-iterator/go/compare/v1.1.9...v1.1.10

- Fix 459 map keys of custom types should serialize using MarshalText when available
- Fix potential panic in (*stringAny).ToInt64 and (*stringAny).ToUint64 (see 450)
- Fix 449 do NOT marshal the field whose name start with underscore
- Reuse stream buffer and remove flush in (*Stream).WriteMore(see 441 440)
- Fix 421 simplify the error string returned by the decoder when it meets error unmarshaling anonymous structs
- Fix 389 411 do NOT marshal the json.RawMessage type field whose real type is integer/float as "null" with ValidateJsonRawMessage option enabled
- Fix 326 do Not marshal private field after calling extra.SetNamingStrategy() to register naming strategy extension

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 09:57:36 +02:00