Merge pull request cri-o#8217 from saschagrunert/podman

Switch to `containers/common/pkg/crutils`

go.mod

@@ -11,22 +11,21 @@ require (
  github.com/checkpoint-restore/checkpointctl v1.1.0
  github.com/checkpoint-restore/go-criu/v7 v7.1.0
  github.com/containerd/cgroups v1.1.0
- github.com/containerd/containerd v1.7.16
+ github.com/containerd/containerd v1.7.17
  github.com/containerd/fifo v1.1.0
  github.com/containerd/nri v0.6.1
  github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723
  github.com/containerd/ttrpc v1.2.4
  github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67
  github.com/containernetworking/cni v1.1.2
- github.com/containernetworking/plugins v1.4.1
- github.com/containers/common v0.58.3
+ github.com/containernetworking/plugins v1.5.0
+ github.com/containers/common v0.59.0
  github.com/containers/conmon v2.0.20+incompatible
  github.com/containers/conmon-rs v0.6.3
- github.com/containers/image/v5 v5.30.1
+ github.com/containers/image/v5 v5.31.0
  github.com/containers/kubensmnt v1.2.0
  github.com/containers/ocicrypt v1.1.10
- github.com/containers/podman/v5 v5.0.3
- github.com/containers/storage v1.53.0
+ github.com/containers/storage v1.54.0
  github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
  github.com/cpuguy83/go-md2man v1.0.10
  github.com/creack/pty v1.1.21
@@ -46,7 +45,7 @@ require (
  github.com/intel/goresctrl v0.7.0
  github.com/json-iterator/go v1.1.12
  github.com/kata-containers/kata-containers/src/runtime v0.0.0-20240208092920-b99f57452225
- github.com/onsi/ginkgo/v2 v2.17.3
+ github.com/onsi/ginkgo/v2 v2.18.0
  github.com/onsi/gomega v1.33.1
  github.com/opencontainers/go-digest v1.0.0
  github.com/opencontainers/image-spec v1.1.0
@@ -89,7 +88,7 @@ require (
 require (
  capnproto.org/go/capnp/v3 v3.0.0-alpha.25 // indirect
  dario.cat/mergo v1.0.0 // indirect
- github.com/Microsoft/hcsshim v0.12.0 // indirect
+ github.com/Microsoft/hcsshim v0.12.3 // indirect
  github.com/ProtonMail/go-crypto v1.0.0 // indirect
  github.com/VividCortex/ewma v1.2.0 // indirect
  github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
@@ -111,8 +110,8 @@ require (
  github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
  github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
  github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
- github.com/distribution/reference v0.5.0 // indirect
- github.com/docker/docker v25.0.5+incompatible // indirect
+ github.com/distribution/reference v0.6.0 // indirect
+ github.com/docker/docker v26.1.3+incompatible // indirect
  github.com/docker/docker-credential-helpers v0.8.1 // indirect
  github.com/docker/go-connections v0.5.0 // indirect
  github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -125,22 +124,22 @@ require (
  github.com/go-git/go-git/v5 v5.12.0 // indirect
  github.com/go-jose/go-jose/v3 v3.0.3 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
- github.com/go-openapi/analysis v0.21.4 // indirect
- github.com/go-openapi/errors v0.21.1 // indirect
- github.com/go-openapi/jsonpointer v0.20.0 // indirect
- github.com/go-openapi/jsonreference v0.20.2 // indirect
- github.com/go-openapi/loads v0.21.2 // indirect
- github.com/go-openapi/runtime v0.26.0 // indirect
- github.com/go-openapi/spec v0.20.11 // indirect
- github.com/go-openapi/strfmt v0.22.2 // indirect
- github.com/go-openapi/swag v0.22.10 // indirect
- github.com/go-openapi/validate v0.22.3 // indirect
+ github.com/go-openapi/analysis v0.23.0 // indirect
+ github.com/go-openapi/errors v0.22.0 // indirect
+ github.com/go-openapi/jsonpointer v0.21.0 // indirect
+ github.com/go-openapi/jsonreference v0.21.0 // indirect
+ github.com/go-openapi/loads v0.22.0 // indirect
+ github.com/go-openapi/runtime v0.28.0 // indirect
+ github.com/go-openapi/spec v0.21.0 // indirect
+ github.com/go-openapi/strfmt v0.23.0 // indirect
+ github.com/go-openapi/swag v0.23.0 // indirect
+ github.com/go-openapi/validate v0.24.0 // indirect
  github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.4 // indirect
  github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
  github.com/google/go-cmp v0.6.0 // indirect
- github.com/google/go-containerregistry v0.19.0 // indirect
+ github.com/google/go-containerregistry v0.19.1 // indirect
  github.com/google/go-github/v58 v58.0.0 // indirect
  github.com/google/go-intervals v0.0.2 // indirect
  github.com/google/go-querystring v1.1.0 // indirect
@@ -165,6 +164,7 @@ require (
  github.com/miekg/pkcs11 v1.1.1 // indirect
  github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/moby/docker-image-spec v1.3.1 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/sys/mountinfo v0.7.1 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
@@ -179,46 +179,45 @@ require (
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
  github.com/proglottis/gpgme v0.1.3 // indirect
- github.com/prometheus/client_model v0.5.0 // indirect
- github.com/prometheus/common v0.48.0 // indirect
+ github.com/prometheus/client_model v0.6.0 // indirect
+ github.com/prometheus/common v0.51.1 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
  github.com/rivo/uniseg v0.4.7 // indirect
  github.com/russross/blackfriday v1.6.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
  github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
- github.com/sigstore/fulcio v1.4.3 // indirect
- github.com/sigstore/rekor v1.3.4 // indirect
- github.com/sigstore/sigstore v1.8.2 // indirect
+ github.com/sigstore/fulcio v1.4.5 // indirect
+ github.com/sigstore/rekor v1.3.6 // indirect
+ github.com/sigstore/sigstore v1.8.3 // indirect
  github.com/skeema/knownhosts v1.2.2 // indirect
- github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
- github.com/sylabs/sif/v2 v2.15.1 // indirect
+ github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
+ github.com/sylabs/sif/v2 v2.16.0 // indirect
  github.com/tchap/go-patricia/v2 v2.3.1 // indirect
  github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
  github.com/ulikunitz/xz v0.5.12 // indirect
  github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4 // indirect
  github.com/vbatts/tar-split v0.11.5 // indirect
- github.com/vbauerster/mpb/v8 v8.7.2 // indirect
+ github.com/vbauerster/mpb/v8 v8.7.3 // indirect
  github.com/vishvananda/netns v0.0.4 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
  github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
  go.mongodb.org/mongo-driver v1.14.0 // indirect
  go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
  go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
  go.opentelemetry.io/otel/metric v1.26.0 // indirect
  go.opentelemetry.io/proto/otlp v1.2.0 // indirect
  golang.org/x/crypto v0.23.0 // indirect
- golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+ golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
  golang.org/x/mod v0.17.0 // indirect
- golang.org/x/oauth2 v0.18.0 // indirect
+ golang.org/x/oauth2 v0.20.0 // indirect
  golang.org/x/term v0.20.0 // indirect
  golang.org/x/text v0.15.0 // indirect
  golang.org/x/time v0.5.0 // indirect
  golang.org/x/tools v0.21.0 // indirect
- google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
+ google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
  gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect