diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-13 16:01:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 16:01:25 -0500 |
| commit | e273ba34efd1c6fe928cde832d3da8f5a9bc6c49 (patch) | |
| tree | 57209b2fc3a82ace61404e083bd0a1524090860b /vendor | |
| parent | bbff9c8710870bbadbaf2e69e827db30c109bbb9 (diff) | |
| parent | 566a92395091434d8da77e4ce8967ed997a83a40 (diff) | |
| download | podman-e273ba34efd1c6fe928cde832d3da8f5a9bc6c49.tar.gz podman-e273ba34efd1c6fe928cde832d3da8f5a9bc6c49.tar.bz2 podman-e273ba34efd1c6fe928cde832d3da8f5a9bc6c49.zip | |
Merge pull request #8966 from ashley-cui/common33
Vendor in common 0.33.1
Diffstat (limited to 'vendor')
6 files changed, 8 insertions, 8 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index 16817f7b3..3b8baf87a 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -318,7 +318,7 @@ type EngineConfig struct { // RuntimeSupportsNoCgroups is a list of OCI runtimes that support // running containers without CGroups. - RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroupv2,omitempty"` + RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroup,omitempty"` // RuntimeSupportsKVM is a list of OCI runtimes that support // KVM separation for containers. diff --git a/vendor/github.com/containers/common/pkg/retry/retry.go b/vendor/github.com/containers/common/pkg/retry/retry.go index a06c7c08d..8eb2da975 100644 --- a/vendor/github.com/containers/common/pkg/retry/retry.go +++ b/vendor/github.com/containers/common/pkg/retry/retry.go @@ -69,7 +69,7 @@ func isRetryable(err error) bool { } return isRetryable(e.Err) case syscall.Errno: - return shouldRestart(e) + return isErrnoRetryable(e) case errcode.Errors: // if this error is a group of errors, process them all in turn for i := range e { @@ -94,10 +94,10 @@ func isRetryable(err error) bool { return false } -func shouldRestart(e error) bool { +func isErrnoRetryable(e error) bool { switch e { case syscall.ECONNREFUSED, syscall.EINTR, syscall.EAGAIN, syscall.EBUSY, syscall.ENETDOWN, syscall.ENETUNREACH, syscall.ENETRESET, syscall.ECONNABORTED, syscall.ECONNRESET, syscall.ETIMEDOUT, syscall.EHOSTDOWN, syscall.EHOSTUNREACH: return true } - return shouldRestartPlatform(e) + return isErrnoERESTART(e) } diff --git a/vendor/github.com/containers/common/pkg/retry/retry_linux.go b/vendor/github.com/containers/common/pkg/retry/retry_linux.go index 9da0ba287..b7942f7f4 100644 --- a/vendor/github.com/containers/common/pkg/retry/retry_linux.go +++ b/vendor/github.com/containers/common/pkg/retry/retry_linux.go @@ -4,6 +4,6 @@ import ( "syscall" ) -func shouldRestartPlatform(e error) bool { +func isErrnoERESTART(e error) bool { return e == syscall.ERESTART } diff --git a/vendor/github.com/containers/common/pkg/retry/retry_unsupported.go b/vendor/github.com/containers/common/pkg/retry/retry_unsupported.go index cf55b2a94..676980975 100644 --- a/vendor/github.com/containers/common/pkg/retry/retry_unsupported.go +++ b/vendor/github.com/containers/common/pkg/retry/retry_unsupported.go @@ -2,6 +2,6 @@ package retry -func shouldRestartPlatform(e error) bool { +func isErrnoERESTART(e error) bool { return false } diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index b696294ac..7d7cf59f1 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.33.0" +const Version = "0.33.1" diff --git a/vendor/modules.txt b/vendor/modules.txt index a7c3b628a..fe536da18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -89,7 +89,7 @@ github.com/containers/buildah/pkg/parse github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/util -# github.com/containers/common v0.33.0 +# github.com/containers/common v0.33.1 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/apparmor/internal/supported github.com/containers/common/pkg/auth |