Commit Graph

247 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
9f61affa09 vendor: containerd/containerd v1.4.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 23:25:07 +02:00
Davanum Srinivas
da4a8aea15 Update to latest kubernetes v1.19.2
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-09-17 12:37:19 -04:00
Sebastiaan van Stijn
407c3eba2e vendor: github.com/willf/bitset v1.1.11
The changes needed by opencontainers/selinux are now in a tagged
release. This will make our dependency slightly ahead of what's
used by opencontainers/selinux until a v1.6.1 is tagged.

full diff: https://github.com/willf/bitset/compare/d5bec3311243...v1.1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 17:59:09 +02:00
Derek McGowan
56a89cda34 Merge pull request #1552 from crosbymichael/nri
Add experimental NRI injection points
2020-08-24 13:58:11 -07:00
Antonio Ojea
1403a391c3 bump cni dependencies
Signed-off-by: Antonio Ojea <aojea@redhat.com>
2020-08-21 18:00:20 +02:00
Michael Crosby
63f89eb954 Update server with nri injection points
This allows development with container to be done for NRI without the need for
custom builds.

This is an experimental feature and is not enabled unless a user has a global
`/etc/nri/conf.json` config setup with plugins on the system.  No NRI code will
be executed if this config file does not exist.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-08-20 08:10:09 -04:00
Michael Crosby
b777982928 Update vendor for new containerd and nri
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-08-20 07:28:37 -04:00
Mike Brown
b0cc07999a vendor containerd 1.4 release
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-08-20 05:14:45 -05: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
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
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
ktock
b51177bfcc Vendor containerd d184a0a343
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-27 10:48:20 +09:00
Michael Crosby
5f5d954b6a add selinux category range to config
This allows an admin to set the upper bounds on the category range for selinux
labels.  This can be useful when handling allocation of PVs or other volume
types that need to be shared with selinux enabled on the hosts and volumes.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 16:02:07 -04:00
Michael Crosby
9b06da4773 update selinux to 1.6.0 release
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 15:57:28 -04:00
Akihiro Suda
fb208d015a vendor runc v1.0.0-rc91
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-03 14:03:21 +09:00
Davanum Srinivas
0d18d1ee38 Drop k8s.io/kubernetes
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 14:48:25 -04:00
Davanum Srinivas
41f184f15b Update vendor.conf to kubernetes 1.19.0-beta.2
update streaming import path
switch remote package path

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 08:44:49 -04:00
Michael Crosby
713205b369 bump selinux dep
Includes fixes for the category range and mount labeling.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-06-15 15:15:35 -04:00
Michael Crosby
477b31ce04 Use go-cni tag
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-05-26 19:32:03 -04:00
Sebastiaan van Stijn
0b3c7e1479 vendor: opencontainers/selinux v1.5.2
full diff: https://github.com/opencontainers/selinux/compare/v1.5.1...v1.5.2

- Implement FormatMountLabel unconditionally
  Implementing FormatMountLabel on situations built without selinux
  should be possible; the context will be ignored if no SELinux is available.
- Remote potential race condition, where mcs label is freed
  Theorectially if you do not change the MCS Label then we free it and two
  commands later reserve it. If some other process was grabbing MCS Labels
  at the same time, the other process could get the same label.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-26 16:30:35 +02:00
Sebastiaan van Stijn
6096c0ebbb vendor.conf: back to using tags
When I changed the vendor.conf format to use tags, many of the
dependencies didn't use tagged versions, and the column format
made the file slightly more consistent / easier to read.

With many dependencies moving to go modules, we see more deps
tagging releases, and we're now more actively trying to use
tagged releases for our dependencies.

With containerd/containerd changing the format to use tags as
default, it makes sense to do the same here as well (to allow
for easier comparing the vendor.conf files between repositories)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-18 15:44:42 +02:00
Mike Brown
dc81240a6d Merge pull request #1484 from thaJeztah/bump_containerd
vendor: containerd/containerd v1.4.0-beta.0
2020-05-18 08:11:36 -05:00
Sebastiaan van Stijn
f9083f167a vendor: containerd/containerd v1.4.0-beta.0
full diff: ed261720c8...v1.4.0-beta.0

Relevant changes:

- Replace errors.Cause() with errors.Is()
- Transfer error to ErrNotFound when kill a not exist container
- vendor: update containerd/cri, remove "docker/distribution" dependency
- vendor: containerd/continuity, containerd/fifo, containerd/go-runc
- vendor: opencontainers/go-digest v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-16 14:37:00 +02:00
Sebastiaan van Stijn
103785ea26 vendor: containerd/go-cni 0553354f0046ccd41a02e724826040491a3d8998
full diff: 0d360c50b1...0553354f00

- Add WithConfList opt for adding conf list from bytes
- Use Go modules instead of vndr
- Test on go1.13, 1.14, remove go1.12
- Update pkg/errors v0.9.1, switch to using errors.Is() instead of errors.Cause()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-16 12:58:26 +02:00
Derek McGowan
21ad9c4e21 Use digestset from go-digest
Removes docker/distribution dependency

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-05-11 14:17:34 -07:00
Akihiro Suda
51261876f0 Merge pull request #1474 from thaJeztah/bump_k8s
vendor: kubernetes v1.18.2
2020-05-10 09:46:48 +09:00
Sebastiaan van Stijn
498128cf41 vendor: kubernetes v1.18.2
Fix client watch reestablishment handling of client-side timeouts

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 17:03:06 +02:00
Sebastiaan van Stijn
ee3548dee8 vendor: containerd/containerd ed261720c8
full diff: 0131015594...ed261720c8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 16:11:56 +02:00
Sebastiaan van Stijn
c784772ba4 vendor: roll docker/distribution back to latest (v2.7.1) release
Now that 901bcb2231 was merged in containerd,
we no longer depend on the ParseDockerRef utility from docker/distribution,
so we can safely roll back to the latest release for this dependency.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:33:55 +02:00
Sebastiaan van Stijn
004ff8b995 vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644
full diff: 60c3aa43f4...4032b1d8aa

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:22:12 +02:00
Sebastiaan van Stijn
fae2a4b052 vendor: update to latest hcsshim - 0.8.9
Switch to a tagged version of hcsshim. Context here:
https://github.com/kubernetes/kubernetes/issues/87420#issuecomment-620837610

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:20:19 +02:00
Sebastiaan van Stijn
cdac4dece4 vendor: update go-events to fix alignment for 32bit systems
- relates to moby/buildkit 1111
- relates to moby/buildkit 1079
- relates to docker/buildx 129

full diff: 9461782956...e31b211e4f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:18:50 +02:00
Sebastiaan van Stijn
fe3a018f51 vendor: bump containerd/typeurl v1.0.1
full diff: https://github.com/containerd/typeurl/compare/v1.0.0...v1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:15:20 +02:00
Sebastiaan van Stijn
5494d6ffad vendor: containerd/ttrpc v1.0.1
full diff: https://github.com/containerd/ttrpc/compare/v1.0.0...v1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:08:23 +02:00
Sebastiaan van Stijn
20ee06b0b3 vendor: containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
full diff: 7347743e5d...b444813739

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:07:01 +02:00
Sebastiaan van Stijn
07106ad049 vendor: runtime-spec v1.0.2
full diff: 29686dbc55...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:05:25 +02:00
Sebastiaan van Stijn
2a5e493198 vendor: github.com/pkg/errors v0.9.1
full diff: https://github.com/pkg/errors/compare/v0.8.1...v0.9.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:04:35 +02:00
Sebastiaan van Stijn
ee67a4d67f vendor: sirupsen/logrus v1.6.0
v1.6.0

full diff: https://github.com/sirupsen/logrus/compare/v1.5.0...v1.6.0

- Add flag to disable quotes in TextFormatter
- Revert "fix race conditions on entry"
    - fixes Deadlock during Entry.Infof after upgrade to v1.5.0
    - fixes Deadlock when using WithField inside of hook
    - fixes Overly-aggressive mutex locks

v1.4.1...v1.5.0

full diff: https://github.com/sirupsen/logrus/compare/v1.4.1...v1.5.0

- Ability to DisableHTMLEscape when using the JSON formatter
- Support/fixes for go 1.14
- Many many bugfixes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:02:29 +02:00
Sebastiaan van Stijn
271218ef7d vendor konsorten/go-windows-terminal-sequences v1.0.3
full diff: https://github.com/konsorten/go-windows-terminal-sequences/compare/v1.0.1...v1.0.3

- Fixes a panic when using logrus on Go 1.14
- Fix compile error on linux and darwin

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:00:59 +02:00
Davanum Srinivas
2b162b6c11 update selinux dependency to fix test failures
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-04-15 14:59:43 -04:00
Mike Brown
d531dc492a Merge pull request #1405 from fuweid/me-async-load-cnicnf
reload cni network config if has fs change events
2020-04-15 13:57:32 -05:00
Wei Fu
4ce334aa49 reload cni network config if has fs change events
With go RWMutex design, no goroutine should expect to be able to
acquire a read lock until the read lock has been released, if one
goroutine call lock.

The original design is to reload cni network config on every single
Status CRI gRPC call. If one RunPodSandbox request holds read lock
to allocate IP for too long, all other RunPodSandbox/StopPodSandbox
requests will wait for the RunPodSandbox request to release read lock.
And the Status CRI call will fail and kubelet becomes NOTReady.

Reload cni network config at every single Status CRI call is not
necessary and also brings NOTReady situation. To lower the possibility
of NOTReady, CRI will reload cni network config if there is any valid fs
change events from the cni network config dir.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-04-03 12:28:58 +08:00
Mike Brown
27d4fd5979 Merge pull request #1425 from dims/fix-x/sys-dependency-version
use the same dependency version for x/sys from containerd/containerd
2020-03-30 12:00:13 -05:00