Skip to content

Commit 32f64d5

Browse files
authored
Omnibus dependency updates; switch to pointer field for LinuxPids.Limit (#2682)
* Omnibus dependency updates Merge multiple dependabot updates (including alerts): - #2468 - #2515 - #2516 - #2534 - #2535 - #2536 - #2551 - #2671 - #2672 - #2675 - #2677 - #2678 - #2679 - #2680 - #2681 Also update several other direct dependencies. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * Switch to pointer field for `LinuxPids.Limit` `github.com/opencontainers/runtime-spec/specs-go.LinuxPids.Limit` changed type from `int64` to `*int64` in `v1.3.0`. Update code accordingly. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * go mod tidy and vendor; regenerate proto files Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * test fixes Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> --------- Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
1 parent c0ec0f1 commit 32f64d5

636 files changed

Lines changed: 27184 additions & 63441 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.

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,9 @@ jobs:
561561
BUSYBOX_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/busybox:1.29-2"
562562
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/resource-consumer:1.10"
563563
CGO_ENABLED: 1
564+
# TODO: remove when https://github.com/containerd/containerd/pull/13205 is backported to v2.2 or
565+
# containerd is updated to v2.3
566+
CGROUP_DRIVER: 0
564567
run: |
565568
cat > "${{ env.TEST_IMAGE_LIST }}" << EOF
566569
busybox = "${{ env.BUSYBOX_TESTING_IMAGE_REF }}"

cmd/containerd-shim-runhcs-v1/options/runhcs.pb.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.

cmd/containerd-shim-runhcs-v1/stats/stats.pb.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.

go.mod

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Microsoft/hcsshim
22

3-
go 1.24.0
3+
go 1.25.0
44

55
// protobuf/gRPC/ttrpc generation
66
tool (
@@ -29,85 +29,84 @@ require (
2929
github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29
3030
github.com/blang/semver/v4 v4.0.0
3131
github.com/cenkalti/backoff/v4 v4.3.0
32-
github.com/containerd/cgroups/v3 v3.0.5
32+
github.com/containerd/cgroups/v3 v3.1.3
3333
github.com/containerd/console v1.0.5
34-
github.com/containerd/containerd/api v1.9.0
35-
github.com/containerd/containerd/v2 v2.1.2
34+
github.com/containerd/containerd/api v1.10.0
35+
github.com/containerd/containerd/v2 v2.2.2
3636
github.com/containerd/errdefs v1.0.0
3737
github.com/containerd/errdefs/pkg v0.3.0
3838
github.com/containerd/go-runc v1.1.0
3939
github.com/containerd/log v0.1.0
40-
github.com/containerd/platforms v1.0.0-rc.1
40+
github.com/containerd/platforms v1.0.0-rc.4
4141
github.com/containerd/plugin v1.0.0
42-
github.com/containerd/ttrpc v1.2.7
42+
github.com/containerd/ttrpc v1.2.8
4343
github.com/containerd/typeurl/v2 v2.2.3
4444
github.com/google/go-cmp v0.7.0
45-
github.com/google/go-containerregistry v0.20.1
45+
github.com/google/go-containerregistry v0.21.5
4646
github.com/google/uuid v1.6.0
4747
github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422
4848
github.com/mattn/go-shellwords v1.0.12
4949
github.com/moby/sys/user v0.4.0
5050
github.com/open-policy-agent/opa v0.70.0
51-
github.com/opencontainers/cgroups v0.0.4
52-
github.com/opencontainers/runc v1.3.3
53-
github.com/opencontainers/runtime-spec v1.2.1
51+
github.com/opencontainers/cgroups v0.0.6
52+
github.com/opencontainers/runc v1.4.2
53+
github.com/opencontainers/runtime-spec v1.3.0
5454
github.com/pelletier/go-toml v1.9.5
5555
github.com/pkg/errors v0.9.1
56-
github.com/samber/lo v1.52.0
57-
github.com/sirupsen/logrus v1.9.3
58-
github.com/urfave/cli v1.22.16
59-
github.com/urfave/cli/v2 v2.27.6
56+
github.com/samber/lo v1.53.0
57+
github.com/sirupsen/logrus v1.9.4
58+
github.com/urfave/cli v1.22.17
59+
github.com/urfave/cli/v2 v2.27.7
6060
github.com/vishvananda/netlink v1.3.1
6161
github.com/vishvananda/netns v0.0.5
62-
go.etcd.io/bbolt v1.4.0
62+
go.etcd.io/bbolt v1.4.3
6363
go.opencensus.io v0.24.0
6464
go.uber.org/mock v0.6.0
65-
golang.org/x/net v0.48.0
66-
golang.org/x/sync v0.19.0
67-
golang.org/x/sys v0.40.0
68-
google.golang.org/grpc v1.79.3
69-
google.golang.org/protobuf v1.36.10
65+
golang.org/x/net v0.53.0
66+
golang.org/x/sync v0.20.0
67+
golang.org/x/sys v0.43.0
68+
google.golang.org/grpc v1.80.0
69+
google.golang.org/protobuf v1.36.11
7070
)
7171

7272
require (
73-
cyphar.com/go-pathrs v0.2.1 // indirect
73+
cyphar.com/go-pathrs v0.2.4 // indirect
7474
github.com/OneOfOne/xxhash v1.2.8 // indirect
7575
github.com/agnivade/levenshtein v1.2.0 // indirect
7676
github.com/akavel/rsrc v0.10.2 // indirect
7777
github.com/beorn7/perks v1.0.1 // indirect
7878
github.com/cespare/xxhash/v2 v2.3.0 // indirect
79-
github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect
79+
github.com/checkpoint-restore/go-criu/v7 v7.2.0 // indirect
8080
github.com/cilium/ebpf v0.17.3 // indirect
8181
github.com/containerd/continuity v0.4.5 // indirect
8282
github.com/containerd/fifo v1.1.0 // indirect
8383
github.com/containerd/protobuild v0.3.0 // indirect
84-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
85-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
86-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
87-
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
88-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
89-
github.com/docker/cli v29.2.0+incompatible // indirect
90-
github.com/docker/distribution v2.8.3+incompatible // indirect
91-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
84+
github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect
85+
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
86+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
87+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
88+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
89+
github.com/docker/cli v29.4.0+incompatible // indirect
90+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
9291
github.com/docker/go-units v0.5.0 // indirect
93-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
92+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
9493
github.com/go-ini/ini v1.67.0 // indirect
9594
github.com/go-logr/logr v1.4.3 // indirect
9695
github.com/go-logr/stdr v1.2.2 // indirect
9796
github.com/gobwas/glob v0.2.3 // indirect
98-
github.com/goccy/go-json v0.10.2 // indirect
97+
github.com/goccy/go-json v0.10.3 // indirect
9998
github.com/godbus/dbus/v5 v5.1.0 // indirect
10099
github.com/gogo/protobuf v1.3.2 // indirect
101-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
100+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
102101
github.com/golang/protobuf v1.5.4 // indirect
103102
github.com/gorilla/mux v1.8.1 // indirect
104103
github.com/josephspurrier/goversioninfo v1.5.0 // indirect
105-
github.com/klauspost/compress v1.18.0 // indirect
104+
github.com/klauspost/compress v1.18.5 // indirect
106105
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
107106
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
108107
github.com/lestrrat-go/httpcc v1.0.1 // indirect
109108
github.com/lestrrat-go/iter v1.0.2 // indirect
110-
github.com/lestrrat-go/jwx v1.2.29 // indirect
109+
github.com/lestrrat-go/jwx v1.2.31 // indirect
111110
github.com/lestrrat-go/option v1.0.1 // indirect
112111
github.com/mdlayher/socket v0.5.1 // indirect
113112
github.com/mdlayher/vsock v1.2.1 // indirect
@@ -119,35 +118,36 @@ require (
119118
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
120119
github.com/opencontainers/go-digest v1.0.0 // indirect
121120
github.com/opencontainers/image-spec v1.1.1 // indirect
122-
github.com/opencontainers/selinux v1.13.0 // indirect
123-
github.com/prometheus/client_golang v1.22.0 // indirect
124-
github.com/prometheus/client_model v0.6.1 // indirect
125-
github.com/prometheus/common v0.62.0 // indirect
126-
github.com/prometheus/procfs v0.15.1 // indirect
121+
github.com/opencontainers/selinux v1.13.1 // indirect
122+
github.com/prometheus/client_golang v1.23.2 // indirect
123+
github.com/prometheus/client_model v0.6.2 // indirect
124+
github.com/prometheus/common v0.66.1 // indirect
125+
github.com/prometheus/procfs v0.16.1 // indirect
127126
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
128127
github.com/russross/blackfriday/v2 v2.1.0 // indirect
129-
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
130-
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
131-
github.com/vbatts/tar-split v0.11.5 // indirect
132-
github.com/veraison/go-cose v1.1.0 // indirect
128+
github.com/seccomp/libseccomp-golang v0.11.1 // indirect
129+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
130+
github.com/vbatts/tar-split v0.12.2 // indirect
131+
github.com/veraison/go-cose v1.3.0 // indirect
133132
github.com/x448/float16 v0.8.4 // indirect
134133
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
135134
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
136135
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
137136
github.com/yashtewari/glob-intersection v0.2.0 // indirect
138137
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
139-
go.opentelemetry.io/otel v1.40.0 // indirect
140-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
141-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
142-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
143-
golang.org/x/crypto v0.46.0 // indirect
144-
golang.org/x/mod v0.30.0 // indirect
145-
golang.org/x/text v0.32.0 // indirect
146-
golang.org/x/tools v0.39.0 // indirect
147-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
148-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
138+
go.opentelemetry.io/otel v1.43.0 // indirect
139+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
140+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
142+
go.yaml.in/yaml/v2 v2.4.2 // indirect
143+
golang.org/x/crypto v0.50.0 // indirect
144+
golang.org/x/mod v0.35.0 // indirect
145+
golang.org/x/text v0.36.0 // indirect
146+
golang.org/x/tools v0.44.0 // indirect
147+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
148+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.1 // indirect
149149
gopkg.in/yaml.v3 v3.0.1 // indirect
150-
sigs.k8s.io/yaml v1.4.0 // indirect
150+
sigs.k8s.io/yaml v1.6.0 // indirect
151151
)
152152

153153
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250428153025-10db94c68c34

0 commit comments

Comments
 (0)