Commit Graph

8706 Commits

Author SHA1 Message Date
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
Derek McGowan
6288559231
Prepare 1.4.0-rc.0 release
Move beta release notes and update version

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 22:22:53 -07:00
Maksym Pavlenko
666198cd2a
Merge pull request #4446 from kzys/devmapper-platform
snapshots/devmapper: don't hardcord the platform strings
2020-08-03 13:11:38 -07:00
Kazuyoshi Kato
74e9aa7abb snapshots/devmapper: don't hardcord the platform strings
The snapshotter doesn't have to exclude non-amd64 platforms.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-08-03 11:55:36 -07:00
Akihiro Suda
0f08a55d6b
Merge pull request #4413 from dmcgowan/registry-proxy-ns
Add namespace query parameter for registry proxying
2020-08-04 01:58:52 +09:00
Derek McGowan
adeba792f1
Add namespace query parameter for registry proxying
Proxy registries are designed to serve content from upstreams.
However, the proxy hostname will usually not match the hostname
of the upstream, requiring the proxy to only use a single
upstream or use its own pattern matching to determine the upstream.
To solve this issue, the client will pass along the namespace which
is being used for the request, allowing mirrors to easily map
to multiple upstreams. This query parameter can safely be ignored
if multiple upstreams are not supported.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 09:32:44 -07:00
Akihiro Suda
49837814b3
Merge pull request #4433 from Yikun/enable-new-nodeset
Change nodeset to `ubuntu-xenial-arm64-openlab`
2020-08-03 16:26:38 +09:00
Tonis Tiigi
957bcb3dff docker: split private token helper functions to reusable pkg
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-08-02 22:50:46 -07:00
Maksym Pavlenko
bd92d567a5
Merge pull request #4442 from estesp/noop-deps
Remove seccomp/Linux deps steps in GH Actions
2020-07-31 16:13:34 -07:00
Phil Estes
5a190c7077
Remove seccomp/Linux deps steps in GH Actions
Recent changes removed the need for libseccomp-dev when building
containerd. The btrfs tools package is already installed on GH Actions
runners and was already a no-op so the whole step can be removed.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-31 11:25:26 -04:00
Phil Estes
6162ae93db
Merge pull request #4439 from AkihiroSuda/cri-20200731
vendor: update cri (no more libseccomp cgo dependency)
2020-07-31 11:21:11 -04:00
Akihiro Suda
6988b4d640
remove seccomp buildtag
The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:41:41 +09:00
Akihiro Suda
362b7167a7
vendor: update cri (no more libseccomp cgo dependency)
8448b92d23...8871d5cdf8

The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:32:08 +09:00
Wei Fu
8871d5cdf8
Merge pull request #1548 from AkihiroSuda/remove-libseccomp-dependency
remove libseccomp cgo dependency
2020-07-30 23:30:04 +08:00
Wei Fu
df8352f1ff
Merge pull request #4335 from ktock/sn-doc
Add doc about snapshotter based on shared remote storage
2020-07-30 23:19:59 +08:00
Wei Fu
4a96be9795
Merge pull request #4431 from TBBle/import_manifest_for_test_binary
Import Windows manifest into test build, rather than copying by script
2020-07-30 23:13:15 +08:00
Michael Crosby
fa1220fce3
Merge pull request #4436 from tonistiigi/tokenscopes-public
remotes: mark GetTokenScopes public
2020-07-30 11:07:46 -04:00
Akihiro Suda
7332e2ad2e
remove libseccomp cgo dependency
The CRI plugin was depending on libseccomp cgo dependency via
libseccomp-golang via libcontainer.

https://github.com/seccomp/libseccomp-golang/blob/v0.9.1/seccomp_internal.go#L17

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-30 18:51:23 +09:00
Tonis Tiigi
03b5a053ea remotes: mark GetTokenScopes public
Authorizer interface can’t be really implemented because
scopes are passed in on a side channel via private value in context.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-07-29 23:01:36 -07:00
Akihiro Suda
779ef60231
Merge pull request #4435 from tao12345666333/update-runc
vendor runc library to v1.0.0-rc91-48-g67169a9d
2020-07-30 13:10:51 +09:00
Yikun Jiang
b43a01a221 Change nodeset to ubuntu-xenial-arm64-openlab
The old nodeset is unstable and apt source is unavailable, we change the nodeset from `ubuntu-xenial-arm64` to `ubuntu-xenial-arm64-openlab` to enable stable new nodeset.

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
2020-07-30 09:22:38 +08:00
Mike Brown
858a766264
Merge pull request #1547 from mikebrow/containerd-list-podid-should-search
adds support for pod id lookup for filter
2020-07-29 17:39:18 -05:00
Mike Brown
8a2d1cc802 adds support for pod id lookup for filter
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-29 15:23:22 -05:00