From 3937cc6619e9f1687bac940137bc6a3a4ba32445 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 26 Nov 2020 17:06:02 +0000 Subject: [PATCH] Update containerd vendor This fixes arm64 mac Signed-off-by: Justin Cormack --- src/cmd/linuxkit/vendor.conf | 4 +- .../containerd/containerd/README.md | 43 +- .../containerd/containerd/errdefs/errors.go | 16 +- .../containerd/containerd/log/context.go | 30 - .../containerd/platforms/cpuinfo.go | 23 +- .../containerd/reference/reference.go | 2 +- .../containerd/containerd/vendor.conf | 184 ++--- .../github.com/godbus/dbus/v5/.travis.yml | 50 -- .../github.com/godbus/dbus/v5/CONTRIBUTING.md | 50 -- .../github.com/godbus/dbus/v5/MAINTAINERS | 3 - .../dbus/v5/_examples/bluetooth_introspect.go | 25 - .../godbus/dbus/v5/_examples/eavesdrop.go | 31 - .../godbus/dbus/v5/_examples/introspect.go | 22 - .../godbus/dbus/v5/_examples/list-names.go | 28 - .../godbus/dbus/v5/_examples/monitor.go | 37 - .../godbus/dbus/v5/_examples/notification.go | 17 - .../godbus/dbus/v5/_examples/prop.go | 69 -- .../godbus/dbus/v5/_examples/server.go | 48 -- .../godbus/dbus/v5/_examples/signal.go | 25 - .../godbus/dbus/v5/_examples/tcp_conn.go | 58 -- .../github.com/godbus/dbus/v5/conn_test.go | 560 --------------- .../github.com/godbus/dbus/v5/dbus_test.go | 24 - .../github.com/godbus/dbus/v5/decoder_test.go | 88 --- .../github.com/godbus/dbus/v5/encoder_test.go | 414 ------------ .../godbus/dbus/v5/examples_test.go | 50 -- .../godbus/dbus/v5/exec_command_test.go | 61 -- .../github.com/godbus/dbus/v5/export_test.go | 635 ------------------ .../vendor/github.com/godbus/dbus/v5/go.sum | 0 .../godbus/dbus/v5/introspect/call.go | 28 - .../godbus/dbus/v5/introspect/introspect.go | 86 --- .../dbus/v5/introspect/introspectable.go | 77 --- .../github.com/godbus/dbus/v5/match_test.go | 19 - .../github.com/godbus/dbus/v5/object_test.go | 156 ----- .../github.com/godbus/dbus/v5/prop/prop.go | 285 -------- .../github.com/godbus/dbus/v5/proto_test.go | 369 ---------- .../godbus/dbus/v5/server_interfaces_test.go | 487 -------------- .../github.com/godbus/dbus/v5/sig_test.go | 70 -- .../github.com/godbus/dbus/v5/store_test.go | 99 --- .../dbus/v5/transport_nonce_tcp_test.go | 69 -- .../godbus/dbus/v5/transport_tcp_test.go | 26 - .../godbus/dbus/v5/transport_unix_test.go | 49 -- .../github.com/godbus/dbus/v5/variant_test.go | 78 --- .../vendor/github.com/pkg/errors/README.md | 15 +- .../vendor/github.com/pkg/errors/errors.go | 51 +- .../vendor/github.com/pkg/errors/go113.go | 38 ++ .../vendor/github.com/pkg/errors/stack.go | 109 ++- 46 files changed, 301 insertions(+), 4407 deletions(-) delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/.travis.yml delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/CONTRIBUTING.md delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/MAINTAINERS delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/bluetooth_introspect.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/eavesdrop.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/introspect.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/list-names.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/monitor.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/notification.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/prop.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/server.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/signal.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/_examples/tcp_conn.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/conn_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/dbus_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/decoder_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/encoder_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/examples_test.go delete mode 100755 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/exec_command_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/export_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/go.sum delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/introspect/call.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/introspect/introspect.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/introspect/introspectable.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/match_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/object_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/prop/prop.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/proto_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/server_interfaces_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/sig_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/store_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/transport_tcp_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/transport_unix_test.go delete mode 100644 src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/variant_test.go create mode 100644 src/cmd/linuxkit/vendor/github.com/pkg/errors/go113.go diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index 55665cb07..cf11500ca 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -9,7 +9,7 @@ github.com/agl/ed25519 5312a61534124124185d41f09206b9fef1d88403 github.com/aws/aws-sdk-go fa107560b5f3528a859a1a1511086646731bb1a8 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925 -github.com/containerd/containerd v1.3.3 +github.com/containerd/containerd v1.4.2 github.com/containerd/continuity 0f16d7a0959cac64d7a54ce015e50cf4839d1970 github.com/containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf github.com/containerd/ttrpc 0be804eadb152bc3b3c20c5edc314c4633833398 @@ -58,7 +58,7 @@ github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runc ccbb3364d49d2dc6d9f057134570b0f382f6ceb7 github.com/opencontainers/runtime-spec v1.0.1 github.com/packethost/packngo f1be085ecd6fca1b0a0e25eda71f208dcfcee5ab -github.com/pkg/errors v0.8.0 +github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.0 github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6 diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/README.md b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/README.md index 2323f26f6..a973d5156 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/README.md +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/README.md @@ -1,8 +1,9 @@ ![containerd banner](https://raw.githubusercontent.com/cncf/artwork/master/projects/containerd/horizontal/color/containerd-horizontal-color.png) [![GoDoc](https://godoc.org/github.com/containerd/containerd?status.svg)](https://godoc.org/github.com/containerd/containerd) -[![Build Status](https://travis-ci.org/containerd/containerd.svg?branch=master)](https://travis-ci.org/containerd/containerd) +[![Build Status](https://github.com/containerd/containerd/workflows/CI/badge.svg)](https://github.com/containerd/containerd/actions?query=workflow%3ACI) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/containerd/containerd?branch=master&svg=true)](https://ci.appveyor.com/project/mlaventure/containerd-3g73f?branch=master) +[![Nightlies](https://github.com/containerd/containerd/workflows/Nightly/badge.svg)](https://github.com/containerd/containerd/actions?query=workflow%3ANightly) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fcontainerd%2Fcontainerd.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fcontainerd%2Fcontainerd?ref=badge_shield) [![Go Report Card](https://goreportcard.com/badge/github.com/containerd/containerd)](https://goreportcard.com/report/github.com/containerd/containerd) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1271/badge)](https://bestpractices.coreinfrastructure.org/projects/1271) @@ -24,6 +25,12 @@ See how to build containerd from source at [BUILDING](BUILDING.md). If you are interested in trying out containerd see our example at [Getting Started](docs/getting-started.md). +## Nightly builds + +There are nightly builds available for download [here](https://github.com/containerd/containerd/actions?query=workflow%3ANightly). +Binaries are generated from `master` branch every night for `Linux` and `Windows`. + +Please be aware: nightly builds might have critical bugs, it's not recommended for use in prodution and no support provided. ## Runtime Requirements @@ -147,7 +154,7 @@ Taking a container object and turning it into a runnable process on a system is ```go // create a new task -task, err := redis.NewTask(context, cio.Stdio) +task, err := redis.NewTask(context, cio.NewCreator(cio.WithStdio)) defer task.Delete(context) // the task is now running and has a pid that can be use to setup networking @@ -177,7 +184,7 @@ checkpoint, err := client.Pull(context, "myregistry/checkpoints/redis:master") redis, err = client.NewContainer(context, "redis-master", containerd.WithNewSnapshot("redis-rootfs", checkpoint)) defer container.Delete(context) -task, err = redis.NewTask(context, cio.Stdio, containerd.WithTaskCheckpoint(checkpoint)) +task, err = redis.NewTask(context, cio.NewCreator(cio.WithStdio), containerd.WithTaskCheckpoint(checkpoint)) defer task.Delete(context) err := task.Start(context) @@ -210,6 +217,34 @@ See [PLUGINS.md](PLUGINS.md) for how to create plugins Please see [RELEASES.md](RELEASES.md) for details on versioning and stability of containerd components. +Downloadable 64-bit Intel/AMD binaries of all official releases are available on +our [releases page](https://github.com/containerd/containerd/releases), as well as +auto-published to the [cri-containerd-release storage bucket](https://console.cloud.google.com/storage/browser/cri-containerd-release?pli=1). + +For other architectures and distribution support, you will find that many +Linux distributions package their own containerd and provide it across several +architectures, such as [Canonical's Ubuntu packaging](https://launchpad.net/ubuntu/bionic/+package/containerd). + +#### Enabling command auto-completion + +Starting with containerd 1.4, the urfave client feature for auto-creation of bash and zsh +autocompletion data is enabled. To use the autocomplete feature in a bash shell for example, source +the autocomplete/ctr file in your `.bashrc`, or manually like: + +``` +$ source ./contrib/autocomplete/ctr +``` + +#### Distribution of `ctr` autocomplete for bash and zsh + +For bash, copy the `contrib/autocomplete/ctr` script into +`/etc/bash_completion.d/` and rename it to `ctr`. The `zsh_autocomplete` +file is also available and can be used similarly for zsh users. + +Provide documentation to users to `source` this file into their shell if +you don't place the autocomplete file in a location where it is automatically +loaded for the user's shell environment. + ### Communication For async communication and long running discussions please use issues and pull requests on the github repo. @@ -230,7 +265,7 @@ __If you are reporting a security issue, please reach out discreetly at security ## Licenses -The containerd codebase is released under the [Apache 2.0 license](LICENSE.code). +The containerd codebase is released under the [Apache 2.0 license](LICENSE). The README.md file, and files in the "docs" folder are licensed under the Creative Commons Attribution 4.0 International License. You may obtain a copy of the license, titled CC-BY-4.0, at http://creativecommons.org/licenses/by/4.0/. diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/errdefs/errors.go b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/errdefs/errors.go index b5200afc0..05a35228c 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/errdefs/errors.go +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/errdefs/errors.go @@ -51,43 +51,43 @@ var ( // IsInvalidArgument returns true if the error is due to an invalid argument func IsInvalidArgument(err error) bool { - return errors.Cause(err) == ErrInvalidArgument + return errors.Is(err, ErrInvalidArgument) } // IsNotFound returns true if the error is due to a missing object func IsNotFound(err error) bool { - return errors.Cause(err) == ErrNotFound + return errors.Is(err, ErrNotFound) } // IsAlreadyExists returns true if the error is due to an already existing // metadata item func IsAlreadyExists(err error) bool { - return errors.Cause(err) == ErrAlreadyExists + return errors.Is(err, ErrAlreadyExists) } // IsFailedPrecondition returns true if an operation could not proceed to the // lack of a particular condition func IsFailedPrecondition(err error) bool { - return errors.Cause(err) == ErrFailedPrecondition + return errors.Is(err, ErrFailedPrecondition) } // IsUnavailable returns true if the error is due to a resource being unavailable func IsUnavailable(err error) bool { - return errors.Cause(err) == ErrUnavailable + return errors.Is(err, ErrUnavailable) } // IsNotImplemented returns true if the error is due to not being implemented func IsNotImplemented(err error) bool { - return errors.Cause(err) == ErrNotImplemented + return errors.Is(err, ErrNotImplemented) } // IsCanceled returns true if the error is due to `context.Canceled`. func IsCanceled(err error) bool { - return errors.Cause(err) == context.Canceled + return errors.Is(err, context.Canceled) } // IsDeadlineExceeded returns true if the error is due to // `context.DeadlineExceeded`. func IsDeadlineExceeded(err error) bool { - return errors.Cause(err) == context.DeadlineExceeded + return errors.Is(err, context.DeadlineExceeded) } diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/log/context.go b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/log/context.go index 31f1a3ac0..21599c4fd 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/log/context.go +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/log/context.go @@ -18,7 +18,6 @@ package log import ( "context" - "sync/atomic" "github.com/sirupsen/logrus" ) @@ -38,23 +37,10 @@ type ( loggerKey struct{} ) -// TraceLevel is the log level for tracing. Trace level is lower than debug level, -// and is usually used to trace detailed behavior of the program. -const TraceLevel = logrus.Level(uint32(logrus.DebugLevel + 1)) - // RFC3339NanoFixed is time.RFC3339Nano with nanoseconds padded using zeros to // ensure the formatted time is always the same number of characters. const RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00" -// ParseLevel takes a string level and returns the Logrus log level constant. -// It supports trace level. -func ParseLevel(lvl string) (logrus.Level, error) { - if lvl == "trace" { - return TraceLevel, nil - } - return logrus.ParseLevel(lvl) -} - // WithLogger returns a new context with the provided logger. Use in // combination with logger.WithField(s) for great effect. func WithLogger(ctx context.Context, logger *logrus.Entry) context.Context { @@ -72,19 +58,3 @@ func GetLogger(ctx context.Context) *logrus.Entry { return logger.(*logrus.Entry) } - -// Trace logs a message at level Trace with the log entry passed-in. -func Trace(e *logrus.Entry, args ...interface{}) { - level := logrus.Level(atomic.LoadUint32((*uint32)(&e.Logger.Level))) - if level >= TraceLevel { - e.Debug(args...) - } -} - -// Tracef logs a message at level Trace with the log entry passed-in. -func Tracef(e *logrus.Entry, format string, args ...interface{}) { - level := logrus.Level(atomic.LoadUint32((*uint32)(&e.Logger.Level))) - if level >= TraceLevel { - e.Debugf(format, args...) - } -} diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/platforms/cpuinfo.go b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/platforms/cpuinfo.go index 69b336d67..db65a726b 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/platforms/cpuinfo.go +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/platforms/cpuinfo.go @@ -74,8 +74,8 @@ func getCPUInfo(pattern string) (info string, err error) { } func getCPUVariant() string { - if runtime.GOOS == "windows" { - // Windows only supports v7 for ARM32 and v8 for ARM64 and so we can use + if runtime.GOOS == "windows" || runtime.GOOS == "darwin" { + // Windows/Darwin only supports v7 for ARM32 and v8 for ARM64 and so we can use // runtime.GOARCH to determine the variants var variant string switch runtime.GOARCH { @@ -96,16 +96,21 @@ func getCPUVariant() string { return "" } - switch variant { - case "8", "AArch64": - variant = "v8" - case "7", "7M", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)": + switch strings.ToLower(variant) { + case "8", "aarch64": + // special case: if running a 32-bit userspace on aarch64, the variant should be "v7" + if runtime.GOARCH == "arm" { + variant = "v7" + } else { + variant = "v8" + } + case "7", "7m", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)": variant = "v7" - case "6", "6TEJ": + case "6", "6tej": variant = "v6" - case "5", "5T", "5TE", "5TEJ": + case "5", "5t", "5te", "5tej": variant = "v5" - case "4", "4T": + case "4", "4t": variant = "v4" case "3": variant = "v3" diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/reference/reference.go b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/reference/reference.go index 79f165de0..562ab0d49 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/reference/reference.go +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/reference/reference.go @@ -124,7 +124,7 @@ func (r Spec) Hostname() string { i := strings.Index(r.Locator, "/") if i < 0 { - i = len(r.Locator) + 1 + return r.Locator } return r.Locator[:i] } diff --git a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/vendor.conf b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/vendor.conf index 79ebf3ca7..70214ac1b 100644 --- a/src/cmd/linuxkit/vendor/github.com/containerd/containerd/vendor.conf +++ b/src/cmd/linuxkit/vendor/github.com/containerd/containerd/vendor.conf @@ -1,91 +1,105 @@ -github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f -github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f -github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9 -github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40 -github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13 -github.com/containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877 -github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c -github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 -github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098 -github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 -github.com/docker/go-units v0.4.0 -github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f -github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823 -github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c -github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563 -github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd -github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 -github.com/matttproud/golang_protobuf_extensions v1.0.1 -github.com/gogo/protobuf v1.2.1 -github.com/gogo/googleapis v1.2.0 -github.com/golang/protobuf v1.2.0 -github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db -github.com/opencontainers/runc dc9208a3303feef5b3839f4323d9beb36df0a9dd # v1.0.0-rc10 -github.com/konsorten/go-windows-terminal-sequences v1.0.1 -github.com/sirupsen/logrus v1.4.1 -github.com/urfave/cli v1.22.0 -golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3 -google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0 -github.com/pkg/errors v0.8.1 -github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7 -golang.org/x/sys 9eafafc0a87e0fd0aeeba439a4573537970c44c7 https://github.com/golang/sys -github.com/opencontainers/image-spec v1.0.1 -golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e -github.com/BurntSushi/toml v0.3.1 -github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 -github.com/Microsoft/go-winio v0.4.14 -github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706 -google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 -golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 -github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f -github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2 -gotest.tools v2.3.0 -github.com/google/go-cmp v0.2.0 -go.etcd.io/bbolt v1.3.3 -github.com/hashicorp/errwrap v1.0.0 -github.com/hashicorp/go-multierror v1.0.0 -github.com/hashicorp/golang-lru v0.5.3 -go.opencensus.io v0.22.0 -github.com/imdario/mergo v0.3.7 -github.com/cpuguy83/go-md2man v1.0.10 -github.com/russross/blackfriday v1.5.2 +github.com/beorn7/perks v1.0.1 +github.com/BurntSushi/toml v0.3.1 +github.com/cespare/xxhash/v2 v2.1.1 +github.com/containerd/btrfs 404b9149801e455c8076f615b06dc0abee0a977a +github.com/containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff +github.com/containerd/console v1.0.0 +github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 +github.com/containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf +github.com/containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c +github.com/containerd/ttrpc v1.0.1 +github.com/containerd/typeurl v1.0.1 +github.com/coreos/go-systemd/v22 v22.1.0 +github.com/cpuguy83/go-md2man/v2 v2.0.0 +github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f +github.com/docker/go-metrics v0.0.1 +github.com/docker/go-units v0.4.0 +github.com/godbus/dbus/v5 v5.0.3 +github.com/gogo/googleapis v1.3.2 +github.com/gogo/protobuf v1.3.1 +github.com/golang/protobuf v1.3.5 +github.com/google/go-cmp v0.2.0 +github.com/google/uuid v1.1.1 +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +github.com/hashicorp/errwrap v1.0.0 +github.com/hashicorp/go-multierror v1.0.0 +github.com/hashicorp/golang-lru v0.5.3 +github.com/imdario/mergo v0.3.7 +github.com/konsorten/go-windows-terminal-sequences v1.0.3 +github.com/matttproud/golang_protobuf_extensions v1.0.1 +github.com/Microsoft/go-winio v0.4.14 +github.com/Microsoft/hcsshim v0.8.10 +github.com/opencontainers/go-digest v1.0.0 +github.com/opencontainers/image-spec v1.0.1 +github.com/opencontainers/runc v1.0.0-rc92 +github.com/opencontainers/runtime-spec 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 # v1.0.3-0.20200728170252-4d89ac9fbff6 +github.com/pkg/errors v0.9.1 +github.com/prometheus/client_golang v1.6.0 +github.com/prometheus/client_model v0.2.0 +github.com/prometheus/common v0.9.1 +github.com/prometheus/procfs v0.0.11 +github.com/russross/blackfriday/v2 v2.0.1 +github.com/shurcooL/sanitized_anchor_name v1.0.0 +github.com/sirupsen/logrus v1.6.0 +github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2 +github.com/urfave/cli v1.22.1 # NOTE: urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092 +go.etcd.io/bbolt v1.3.5 +go.opencensus.io v0.22.0 +golang.org/x/net ab34263943818b32f575efc978a3d24e80b04bd7 +golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e +golang.org/x/sys ed371f2e16b4b305ee99df548828de367527b76b +golang.org/x/text v0.3.3 +google.golang.org/genproto e50cd9704f63023d62cd06a1994b98227fc4d21a +google.golang.org/grpc v1.27.1 +gotest.tools/v3 v3.0.2 + +# cgroups dependencies +github.com/cilium/ebpf 1c8d4c9ef7759622653a1d319284a44652333b28 # cri dependencies -github.com/containerd/cri 50b9e10ea54a9b57049fe311e4fe0a96277ef1c2 # release/1.3 -github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1 -github.com/containernetworking/cni v0.7.1 -github.com/containernetworking/plugins v0.7.6 -github.com/davecgh/go-spew v1.1.1 -github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580 -github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00 -github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528 -github.com/emicklei/go-restful v2.9.5 -github.com/google/gofuzz v1.0.0 -github.com/json-iterator/go v1.1.8 -github.com/modern-go/reflect2 1.0.1 -github.com/modern-go/concurrent 1.0.3 -github.com/opencontainers/selinux 5215b1806f52b1fcc2070a8826c542c9d33cd3cf -github.com/seccomp/libseccomp-golang v0.9.1 -github.com/tchap/go-patricia v2.2.6 -golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 -golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 -golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef -gopkg.in/inf.v0 v0.9.1 -gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8 -k8s.io/api kubernetes-1.16.6 -k8s.io/apimachinery kubernetes-1.16.6 -k8s.io/apiserver kubernetes-1.16.6 -k8s.io/cri-api kubernetes-1.16.6 -k8s.io/client-go kubernetes-1.16.6 -k8s.io/klog v1.0.0 -k8s.io/kubernetes v1.16.6 -k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5 -sigs.k8s.io/yaml v1.1.0 +github.com/containerd/cri adc0b6a578ed6f646bb24c1c639d65b70e14cccc # release/1.4 +github.com/davecgh/go-spew v1.1.1 +github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f +github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528 +github.com/emicklei/go-restful v2.9.5 +github.com/go-logr/logr v0.2.0 +github.com/google/gofuzz v1.1.0 +github.com/json-iterator/go v1.1.10 +github.com/modern-go/concurrent 1.0.3 +github.com/modern-go/reflect2 v1.0.1 +github.com/opencontainers/selinux v1.6.0 +github.com/tchap/go-patricia v2.2.6 +github.com/willf/bitset v1.1.11 +golang.org/x/crypto 75b288015ac94e66e3d6715fb68a9b41bf046ec2 +golang.org/x/oauth2 858c2ad4c8b6c5d10852cb89079f6ca1c7309787 +golang.org/x/time 555d28b269f0569763d25dbe1a237ae74c6bcc82 +gopkg.in/inf.v0 v0.9.1 +gopkg.in/yaml.v2 v2.2.8 +k8s.io/api v0.19.4 +k8s.io/apimachinery v0.19.4 +k8s.io/apiserver v0.19.4 +k8s.io/client-go v0.19.4 +k8s.io/cri-api v0.19.4 +k8s.io/klog/v2 v2.2.0 +k8s.io/utils d5654de09c73da55eb19ae4ab4f734f7a61747a6 +sigs.k8s.io/structured-merge-diff/v4 v4.0.1 +sigs.k8s.io/yaml v1.2.0 + +# cni dependencies +github.com/containerd/go-cni v1.0.1 +github.com/containernetworking/cni v0.8.0 +github.com/containernetworking/plugins v0.8.6 +github.com/fsnotify/fsnotify v1.4.9 + +# image decrypt depedencies +github.com/containerd/imgcrypt v1.0.1 +github.com/containers/ocicrypt v1.0.1 +github.com/fullsailor/pkcs7 8306686428a5fe132eac8cb7c4848af725098bd4 +gopkg.in/square/go-jose.v2 v2.3.1 # zfs dependencies -github.com/containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251 -github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb -github.com/google/uuid v1.1.1 +github.com/containerd/zfs 9abf673ca6ff9ab8d9bd776a4ceff8f6dc699c3d +github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb # aufs dependencies -github.com/containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c +github.com/containerd/aufs 371312c1e31c210a21e49bf3dfd3f31729ed9f2f diff --git a/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/.travis.yml b/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/.travis.yml deleted file mode 100644 index dd6767204..000000000 --- a/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -dist: bionic -language: go -go_import_path: github.com/godbus/dbus - -go: - - 1.11.x - - 1.12.x - - 1.13.x - - tip - -matrix: - fast_finish: true - allow_failures: - - go: tip - -addons: - apt: - packages: - - dbus - - dbus-x11 - -before_install: - - export GO111MODULE=on - -script: - - go test -v -race -mod=readonly ./... # Run all the tests with the race detector enabled - - go vet ./... # go vet is the official Go static analyzer - -jobs: - include: - # The build matrix doesn't cover build stages, so manually expand - # the jobs with anchors - - &multiarch - stage: "Multiarch Test" - go: 1.11.x - env: TARGETS="386 arm arm64 ppc64le" - before_install: - - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - script: - - | - set -e - for target in $TARGETS; do - printf "\e[1mRunning test suite under ${target}.\e[0m\n" - GOARCH="$target" go test -v ./... - printf "\n\n" - done - - <<: *multiarch - go: 1.12.x - - <<: *multiarch - go: 1.13.x diff --git a/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/CONTRIBUTING.md b/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/CONTRIBUTING.md deleted file mode 100644 index c88f9b2bd..000000000 --- a/src/cmd/linuxkit/vendor/github.com/godbus/dbus/v5/CONTRIBUTING.md +++ /dev/null @@ -1,50 +0,0 @@ -# How to Contribute - -## Getting Started - -- Fork the repository on GitHub -- Read the [README](README.markdown) for build and test instructions -- Play with the project, submit bugs, submit patches! - -## Contribution Flow - -This is a rough outline of what a contributor's workflow looks like: - -- Create a topic branch from where you want to base your work (usually master). -- Make commits of logical units. -- Make sure your commit messages are in the proper format (see below). -- Push your changes to a topic branch in your fork of the repository. -- Make sure the tests pass, and add any new tests as appropriate. -- Submit a pull request to the original repository. - -Thanks for your contributions! - -### Format of the Commit Message - -We follow a rough convention for commit messages that is designed to answer two -questions: what changed and why. The subject line should feature the what and -the body of the commit should describe the why. - -``` -scripts: add the test-cluster command - -this uses tmux to setup a test cluster that you can easily kill and -start for debugging. - -Fixes #38 -``` - -The format can be described more formally as follows: - -``` -: - - - -