Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 74bb998

Browse files
mikebrowmikebrow
authored
Merge pull request #1391 from dims/sync-vendors-with-containerd-in-release/1.3
[release/1.3] Sync vendors with containerd 1.3.2
2 parents 5d01a3a + fb60c98 commit 74bb998

295 files changed

Lines changed: 26816 additions & 2288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎integration/restart_test.go‎

Lines changed: 5 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ limitations under the License.
1717
package integration
1818

1919
import (
20-
"os"
21-
"os/exec"
2220
"sort"
2321
"testing"
24-
"time"
2522

2623
"github.com/containerd/containerd"
24+
"github.com/containerd/containerd/errdefs"
2725
"github.com/stretchr/testify/assert"
2826
"github.com/stretchr/testify/require"
2927
"golang.org/x/net/context"
@@ -127,7 +125,9 @@ func TestContainerdRestart(t *testing.T) {
127125
task, err := cntr.Task(ctx, nil)
128126
require.NoError(t, err)
129127
_, err = task.Delete(ctx, containerd.WithProcessKill)
130-
require.NoError(t, err)
128+
if err != nil {
129+
require.True(t, errdefs.IsNotFound(err))
130+
}
131131
}
132132
}
133133

@@ -196,149 +196,4 @@ func TestContainerdRestart(t *testing.T) {
196196
}
197197
}
198198

199-
// Note: The test moves runc binary.
200-
// The test requires:
201-
// 1) The runtime is runc;
202-
// 2) runc is in PATH;
203-
func TestUnknownStateAfterContainerdRestart(t *testing.T) {
204-
if *runtimeHandler != "" {
205-
t.Skip("unsupported config: runtime handler is set")
206-
}
207-
runcPath, err := exec.LookPath("runc")
208-
if err != nil {
209-
t.Skip("unsupported config: runc not in PATH")
210-
}
211-
212-
sbConfig := PodSandboxConfig("sandbox", "sandbox-unknown-state")
213-
214-
const testImage = "busybox"
215-
t.Logf("Pull test image %q", testImage)
216-
img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
217-
require.NoError(t, err)
218-
defer func() {
219-
assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))
220-
}()
221-
222-
t.Log("Should not be able to create sandbox without runc")
223-
tmpRuncPath := Randomize(runcPath)
224-
require.NoError(t, os.Rename(runcPath, tmpRuncPath))
225-
defer func() {
226-
os.Rename(tmpRuncPath, runcPath)
227-
}()
228-
sb, err := runtimeService.RunPodSandbox(sbConfig, "")
229-
if err == nil {
230-
assert.NoError(t, runtimeService.StopPodSandbox(sb))
231-
assert.NoError(t, runtimeService.RemovePodSandbox(sb))
232-
t.Skip("unsupported config: runc is not being used")
233-
}
234-
require.NoError(t, os.Rename(tmpRuncPath, runcPath))
235-
236-
t.Log("Create a sandbox")
237-
sb, err = runtimeService.RunPodSandbox(sbConfig, "")
238-
require.NoError(t, err)
239-
defer func() {
240-
// Make sure the sandbox is cleaned up in any case.
241-
runtimeService.StopPodSandbox(sb)
242-
runtimeService.RemovePodSandbox(sb)
243-
}()
244-
ps, err := runtimeService.PodSandboxStatus(sb)
245-
require.NoError(t, err)
246-
assert.Equal(t, runtime.PodSandboxState_SANDBOX_READY, ps.GetState())
247-
248-
t.Log("Create a container")
249-
cnConfig := ContainerConfig(
250-
"container-unknown-state",
251-
testImage,
252-
WithCommand("sleep", "1000"),
253-
)
254-
cn, err := runtimeService.CreateContainer(sb, cnConfig, sbConfig)
255-
require.NoError(t, err)
256-
257-
t.Log("Start the container")
258-
require.NoError(t, runtimeService.StartContainer(cn))
259-
cs, err := runtimeService.ContainerStatus(cn)
260-
require.NoError(t, err)
261-
assert.Equal(t, runtime.ContainerState_CONTAINER_RUNNING, cs.GetState())
262-
263-
t.Log("Move runc binary, so that container/sandbox can't be loaded after restart")
264-
tmpRuncPath = Randomize(runcPath)
265-
require.NoError(t, os.Rename(runcPath, tmpRuncPath))
266-
defer func() {
267-
os.Rename(tmpRuncPath, runcPath)
268-
}()
269-
270-
t.Log("Restart containerd")
271-
RestartContainerd(t)
272-
273-
t.Log("Sandbox should be in NOTREADY state after containerd restart")
274-
ps, err = runtimeService.PodSandboxStatus(sb)
275-
require.NoError(t, err)
276-
assert.Equal(t, runtime.PodSandboxState_SANDBOX_NOTREADY, ps.GetState())
277-
278-
t.Log("Container should be in UNKNOWN state after containerd restart")
279-
cs, err = runtimeService.ContainerStatus(cn)
280-
require.NoError(t, err)
281-
assert.Equal(t, runtime.ContainerState_CONTAINER_UNKNOWN, cs.GetState())
282-
283-
t.Log("Stop/remove the sandbox should fail for the lack of runc")
284-
assert.Error(t, runtimeService.StopPodSandbox(sb))
285-
assert.Error(t, runtimeService.RemovePodSandbox(sb))
286-
287-
t.Log("Stop/remove the container should fail for the lack of runc")
288-
assert.Error(t, runtimeService.StopContainer(cn, 10))
289-
assert.Error(t, runtimeService.RemoveContainer(cn))
290-
291-
t.Log("Move runc back")
292-
require.NoError(t, os.Rename(tmpRuncPath, runcPath))
293-
294-
t.Log("Sandbox should still be in NOTREADY state")
295-
ps, err = runtimeService.PodSandboxStatus(sb)
296-
require.NoError(t, err)
297-
assert.Equal(t, runtime.PodSandboxState_SANDBOX_NOTREADY, ps.GetState())
298-
299-
t.Log("Container should still be in UNKNOWN state")
300-
cs, err = runtimeService.ContainerStatus(cn)
301-
require.NoError(t, err)
302-
assert.Equal(t, runtime.ContainerState_CONTAINER_UNKNOWN, cs.GetState())
303-
304-
t.Log("Sandbox operations which require running state should fail")
305-
_, err = runtimeService.PortForward(&runtime.PortForwardRequest{
306-
PodSandboxId: sb,
307-
Port: []int32{8080},
308-
})
309-
assert.Error(t, err)
310-
311-
t.Log("Container operations which require running state should fail")
312-
assert.Error(t, runtimeService.ReopenContainerLog(cn))
313-
_, _, err = runtimeService.ExecSync(cn, []string{"ls"}, 10*time.Second)
314-
assert.Error(t, err)
315-
_, err = runtimeService.Attach(&runtime.AttachRequest{
316-
ContainerId: cn,
317-
Stdin: true,
318-
Stdout: true,
319-
Stderr: true,
320-
})
321-
assert.Error(t, err)
322-
323-
t.Log("Containerd should still be running now")
324-
_, err = runtimeService.Status()
325-
require.NoError(t, err)
326-
327-
t.Log("Remove the container should fail in this state")
328-
assert.Error(t, runtimeService.RemoveContainer(cn))
329-
330-
t.Log("Remove the sandbox should fail in this state")
331-
assert.Error(t, runtimeService.RemovePodSandbox(sb))
332-
333-
t.Log("Should be able to stop container in this state")
334-
assert.NoError(t, runtimeService.StopContainer(cn, 10))
335-
336-
t.Log("Should be able to stop sandbox in this state")
337-
assert.NoError(t, runtimeService.StopPodSandbox(sb))
338-
339-
t.Log("Should be able to remove container after stop")
340-
assert.NoError(t, runtimeService.RemoveContainer(cn))
341-
342-
t.Log("Should be able to remove sandbox after stop")
343-
assert.NoError(t, runtimeService.RemovePodSandbox(sb))
344-
}
199+
// TODO: Add back the unknown state test.

‎vendor.conf‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,54 @@ github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
55
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
66

77
# containerd dependencies
8-
go.etcd.io/bbolt 2eb7227adea1d5cf85f0bc2a82b7059b13c2fa68
9-
google.golang.org/grpc 25c4f928eaa6d96443009bd842389fb4fa48664e # v1.20.1
10-
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
11-
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
12-
golang.org/x/sys 4c4f7f33c9ed00de01c4c741d2177abfcfe19307 https://github.com/golang/sys
13-
golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
14-
golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
15-
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
16-
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
17-
github.com/sirupsen/logrus v1.4.1
18-
github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
19-
github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563
20-
github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
21-
github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
22-
github.com/pkg/errors v0.8.1
23-
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
24-
github.com/opencontainers/runc f4982d86f7fde0b6f953cc62ccc4022c519a10a9 # v1.0.0-rc8-32-gf4982d86
25-
github.com/opencontainers/image-spec v1.0.1
26-
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
27-
github.com/matttproud/golang_protobuf_extensions v1.0.1
28-
github.com/grpc-ecosystem/go-grpc-prometheus v1.1
29-
github.com/google/uuid v1.1.1
30-
github.com/golang/protobuf v1.2.0
31-
github.com/gogo/protobuf v1.2.1
32-
github.com/gogo/googleapis v1.2.0
33-
github.com/godbus/dbus v3
34-
github.com/docker/go-units v0.4.0
35-
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
36-
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
37-
github.com/coreos/go-systemd v14
38-
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
39-
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
40-
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
41-
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
42-
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
43-
github.com/containerd/containerd d4802a64f9737f02db3426751f380d97fc878dec
44-
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
45-
github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
46-
github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
47-
github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706
48-
github.com/Microsoft/go-winio v0.4.14
498
github.com/BurntSushi/toml v0.3.1
50-
github.com/imdario/mergo v0.3.7
9+
github.com/Microsoft/go-winio v0.4.14
10+
github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706
11+
github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
12+
github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
13+
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
14+
github.com/containerd/containerd v1.3.2
15+
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
16+
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
17+
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
18+
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
19+
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
20+
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 # v14
21+
github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19 # v1.0.10
22+
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
23+
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
24+
github.com/docker/go-units v0.4.0
25+
github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f # v3
26+
github.com/gogo/googleapis v1.2.0
27+
github.com/gogo/protobuf v1.2.1
28+
github.com/golang/protobuf v1.2.0
29+
github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 # v1.1.1
30+
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 # v1.1
31+
github.com/hashicorp/golang-lru v0.5.3
32+
github.com/imdario/mergo 7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
33+
github.com/matttproud/golang_protobuf_extensions v1.0.1
34+
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
35+
github.com/opencontainers/image-spec v1.0.1
36+
github.com/opencontainers/runc d736ef14f0288d6993a1845745d6756cfc9ddd5a # v1.0.0-rc9
37+
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
38+
github.com/pkg/errors v0.8.1
39+
github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
40+
github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
41+
github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563
42+
github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
43+
github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a # v1.5.2
44+
github.com/sirupsen/logrus v1.4.1
45+
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
46+
github.com/urfave/cli v1.22.0
47+
go.etcd.io/bbolt v1.3.3
48+
go.opencensus.io v0.22.0
49+
golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
50+
golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
51+
golang.org/x/sys 9eafafc0a87e0fd0aeeba439a4573537970c44c7 https://github.com/golang/sys
52+
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
53+
google.golang.org/appengine v1.5.0
54+
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
55+
google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0
5156

5257
# kubernetes dependencies
5358
sigs.k8s.io/yaml v1.1.0

‎vendor/github.com/containerd/containerd/cmd/containerd/command/service_unsupported.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/cmd/containerd/command/service_windows.go‎

Lines changed: 21 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/diff/apply/apply_linux.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/diff/stream.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/images/archive/importer.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)