Commit Graph

1958 Commits

Author SHA1 Message Date
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
Mike Brown
36ba7766fb
Merge pull request #1483 from thaJeztah/bump_cni
vendor: containerd/go-cni 0553354f0046ccd41a02e724826040491a3d8998
2020-05-18 08:04:16 -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
Mike Brown
82a602bf12
Merge pull request #1480 from mikebrow/remove-boilerplate
removing boilerplate test already replaced by project boiler check
2020-05-14 19:37:01 -05:00
Mike Brown
3f0aa45453 removing boilerplate test replace by projectboiler check
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-05-14 17:52:12 -05:00
Mike Brown
64aa9da76f
Merge pull request #1477 from saschagrunert/port-forward-timeout
Increase port-forward timeout to 1s to fix e2e test
2020-05-12 07:59:14 -05:00
Sascha Grunert
e2cedb9469
Increase port-forward timeout to 1s to fix e2e test
We encountered two failing end-to-end tests after the adoption of
https://github.com/containerd/cri/pull/1470 in
https://github.com/cri-o/cri-o/pull/3749:

```
Summarizing 2 Failures:
[Fail] [sig-cli] Kubectl Port forwarding With a server listening on 0.0.0.0 that expects a client request [It] should support a client that connects,
sends DATA, and disconnects
test/e2e/kubectl/portforward.go:343

[Fail] [sig-cli] Kubectl Port forwarding With a server listening on localhost that expects a client request [It] should support a client that connects
, sends DATA, and disconnects
test/e2e/kubectl/portforward.go:343
```

Increasing the timeout to 1s fixes the issue.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-05-12 12:43:14 +02:00
Wei Fu
8c366df5c6
Merge pull request #1476 from dmcgowan/replace-docker-distribution
Use digestset from go-digest
2020-05-12 10:18:25 +08: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
Wei Fu
8252e54f93
Merge pull request #1472 from mxpv/profile
Add config flag to default empty seccomp profile
2020-05-11 10:16:00 +08:00
Mike Brown
942c22bec8
Merge pull request #1429 from Random-Liu/create-etcd-user
Create etcd user in cloud init.
2020-05-10 19:39:47 -05:00
Mike Brown
bd0a76565a
Merge pull request #1469 from thaJeztah/remove_libcontainer_system
Remove dependency on libcontainer/system
2020-05-10 19:33:17 -05:00
Derek McGowan
dbedcf8706
Merge pull request #1449 from mikebrow/make-http-with-tlsconfig-a-warning
removes the error when tls is configured for https but http is tried first
2020-05-10 16:09:41 -07:00
Sebastiaan van Stijn
0e1b7bdb59
Remove dependency on libcontainer/system
This swaps the RunningInUserNS() function that we're using
from libcontainer/system with the one in containerd/sys.

This removes the dependency on libcontainer/system, given
these were the only functions we're using from that package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 21:58:16 +02:00
Maksym Pavlenko
674fe72aa8 Update docs for unset seccomp profile
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-05-10 10:46:58 -07:00
Mike Brown
9413131c7d
Merge pull request #1475 from thaJeztah/remove_deprecated_dualstack
newTransport(): remove deprecated DualStack option
2020-05-10 10:13:26 -05:00
Sebastiaan van Stijn
c96373f6d5
newTransport(): remove deprecated DualStack option
The `DualStack` option was deprecated in Go 1.12, and is now enabled by default
(through commit github.com/golang/go@efc185029bf770894defe63cec2c72a4c84b2ee9).

> The Dialer.DualStack field is now meaningless and documented as deprecated.
>
> To disable fallback, set FallbackDelay to a negative value.

The default `FallbackDelay` is 300ms; to make this more explicit, this patch
sets `FallbackDelay` to the default value.

Note that Docker Hub currently does not support IPv6 (DNS for registry-1.docker.io
has no AAAA records, so we should not hit the 300ms delay).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 12:39:10 +02: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
Akihiro Suda
34e6985f78
Merge pull request #1473 from thaJeztah/bump_containerd
vendor: update containerd and dependencies to ed261720c8
2020-05-10 09:45:57 +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
Wei Fu
7361cf8621
Merge pull request #1470 from aojea/gocat
Get rid of socat for port forwarding
2020-05-09 10:55:58 +08:00
Antonio Ojea
11a78d9d0f
don't use socat for port forwarding
use goroutines to copy the data from the stream to the TCP
connection, and viceversa, removing the socat dependency.

Quoting Lantao Liu, the logic is as follow:

When one side (either pod side or user side) of portforward
is closed, we should stop port forwarding.

When one side is closed, the io.Copy use that side as source will close,
but the io.Copy use that side as dest won't.

Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
2020-05-09 00:54:30 +02:00
Maksym Pavlenko
38f19f991e Add config flag to default empty seccomp profile
This changes adds `default_seccomp_profile` config switch to apply default seccomp profile when not provided by k8s.a

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-05-08 13:24:38 -07:00
Lantao Liu
3a7fef51fc Create etcd user in cloud init.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-05-08 10:14:53 -07:00
Mike Brown
65830369b6
Merge pull request #1468 from fuweid/me-change-rollback
RunPodSandbox: destroy network if fails or invalid
2020-05-01 18:09:07 -05:00
Wei Fu
9c506d0af4
Merge pull request #1465 from dsyer/master
Clarify that plugin names are long in version = 2
2020-05-01 12:09:28 +08:00
Wei Fu
48e797c77f RunPodSandbox: destroy network if fails or invalid
Should destroy the pod network if fails to setup or return invalid
net interface, especially multiple CNI configurations.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-05-01 12:07:33 +08:00
Mike Brown
dc7afe8fbe
Merge pull request #1466 from ktock/parallel-snapshot
Pass chained layer digests to snapshotter for parallel snapshot preparation
2020-04-28 11:12:37 -05:00
ktock
ca661c8dc9 Pass chained layer digests to snapshotter for parallel snapshot preparation
Currently, CRI plugin passes each layer digest to remote snapshotters
sequentially, which leads to sequential snapshots preparation. But it costs
extra time especially for remote snapshotters which need to connect to the
remote backend store (e.g. registries) for checking the snapshot existence on
each preparation.

This commit solves this problem by introducing new label
`containerd.io/snapshot/cri.chain` for passing all layer digests in an image to
snapshotters and by allowing them to prepare these snapshots in parallel, which
leads to speed up the preparation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-04-28 15:03:08 +09:00
Dave Syer
5ac8515bf0 Clarify that plugin names are long in version = 2
Otherwise it's confusing for readers who just need quick reference
for plugin configurations.

Signed-off-by: Dave Syer <dsyer@pivotal.io>
2020-04-27 14:35:41 +01:00
Mike Brown
4ea4ca99c7
Merge pull request #1455 from 6WIND/master
fix incomplete host device for PrivilegedWithoutHostDevices
2020-04-26 22:28:20 -05:00
Wei Fu
197dca5a35
Merge pull request #1464 from mikebrow/test-apparmor-profile
move up to latest critools; add apparmor profile check
2020-04-27 11:16:28 +08:00
Mike Brown
776c125e4f move up to latest critools; add apparmor profile check
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-04-26 16:16:48 -05:00
Mike Brown
14c4b47bb1
Merge pull request #1459 from mikebrow/containerd-project-readme
link readme to containerd/project
2020-04-23 10:19:34 -05:00
Mike Brown
6b01946938 link readme to containerd/project repo
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-04-23 09:26:12 -05:00
Mike Brown
2db26cc9f0
Merge pull request #1458 from mikebrow/copyright-alignment
use containerd/project header test
2020-04-23 07:32:13 -05:00
Phil Estes
4147010574
Merge pull request #1457 from hickeyma/fix-docs
Add improvement to docs
2020-04-23 08:29:16 -04:00