Commit Graph

8778 Commits

Author SHA1 Message Date
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
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
Akihiro Suda
4e6644c8cf
Merge pull request #1551 from thaJeztah/bump_kubernetes_1.19.0-rc.4
vendor: kubernetes 1.19.0 rc.4 and dependencies
2020-08-10 19:18:50 +09: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
Akihiro Suda
0619de413c
Merge pull request #1555 from thaJeztah/bump_golang_1.13.15
Bump Golang 1.13.15
2020-08-09 03:00:33 +09:00
Sebastiaan van Stijn
34596c9c90
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:10:30 +02: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
kenneth.kang
e20a5079e8 Add --cpu-quota, --cpu-period flag to ctr
Signed-off-by: Kenneth Kang <kenneth.kang@lge.com>
2020-08-06 10:04:59 +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
Mike Brown
5c6c6b2ac7
Merge pull request #1550 from thaJeztah/bump_containerd_v1.4.0-rc.0
Bump containerd v1.4.0 rc.0
2020-08-05 17:56:08 -05:00
Mike Brown
a8b6b6b065
Merge pull request #1549 from thaJeztah/bump_golang_1.13.14
Bump Golang 1.13.14
2020-08-05 10:15:48 -05:00
Sebastiaan van Stijn
ecbdffc9c5
vendor: update kubernetes v1.19.0-rc.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 15:48:45 +02:00
Sebastiaan van Stijn
968d44d1bc
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-05 15:48:43 +02:00
Sebastiaan van Stijn
e018d6fa41
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-05 15:48:41 +02:00
Sebastiaan van Stijn
bee6ab5a15
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-05 15:48:38 +02:00
Sebastiaan van Stijn
117c169992
vendor: containerd v1.4.0-rc.0
full diff: d184a0a343...v1.4.0-rc.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 15:38:30 +02:00
Sebastiaan van Stijn
fd030873ac
vendor: opencontainers/runc v1.0.0-rc91-48-g67169a9d
full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc91...67169a9d43456ff0d5ae12b967acb8e366e2f181

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 15:36:19 +02:00
Sebastiaan van Stijn
78e5277419
vendor: containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
full diff: d3ef23f19f...efbc4488d8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 15:33:10 +02:00
Sebastiaan van Stijn
93a03cc810
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-05 14:27:14 +02:00
Sebastiaan van Stijn
bfba0f2840
Bump Golang 1.13.14
full diff: https://github.com/golang/go/compare/go1.13.12...go1.13.14

- go1.13.14 (released 2020/07/16) includes fixes to the compiler, vet, and the
  database/sql, net/http, and reflect packages. See the Go 1.13.14 milestone on
  the issue tracker for details:
  https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved
- go1.13.13 (released 2020/07/14) includes security fixes to the crypto/x509 and
  net/http packages. See the Go 1.13.13 milestone on our issue tracker for details:
  https://github.com/golang/go/issues?q=milestone%3AGo1.13.13+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 13:29:16 +02:00
Sebastiaan van Stijn
3cc2be2a87
Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
full diff: 16911795a3...2bf7674922

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 13:17:11 +02:00
Tonis Tiigi
b5185eae6c auth: return token structs from fetcher functions
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-08-04 12:59:06 -07:00
Derek McGowan
85b15eff45
Merge pull request #4449 from dmcgowan/prepare-1.4.0-rc.0
Prepare 1.4.0-rc.0 release
2020-08-04 10:57:07 -07:00