Skip to content

Commit 0e7cfc4

Browse files
arnaldo2792arnaldo2792
authored
Merge pull request #146 from yeazelm/go_updates
Update host-ctr Go dependencies
2 parents d422b91 + 6f32169 commit 0e7cfc4

File tree

3 files changed

+212
-232
lines changed

3 files changed

+212
-232
lines changed

‎packages/host-ctr/host-ctr.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
4444
cp -r %{_builddir}/sources/%{workspace_name}/* .
4545

4646
%build
47-
export GO_MAJOR="1.22"
47+
export GO_MAJOR="1.23"
4848

4949
%set_cross_go_flags
5050
go build -ldflags="${GOLDFLAGS}" -o host-ctr ./cmd/host-ctr

‎sources/host-ctr/go.mod‎

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ go 1.22.0
55
toolchain go1.22.2
66

77
require (
8-
github.com/aws/aws-sdk-go v1.54.20
9-
github.com/awslabs/amazon-ecr-containerd-resolver v0.0.0-20240521172427-b580afd02343
10-
github.com/containerd/containerd v1.7.20
8+
github.com/aws/aws-sdk-go v1.55.5
9+
github.com/awslabs/amazon-ecr-containerd-resolver v0.0.0-20240904232546-7b72333e780f
10+
github.com/containerd/containerd v1.7.22
1111
github.com/containerd/errdefs v0.1.0
1212
github.com/containerd/log v0.1.0
1313
github.com/opencontainers/runtime-spec v1.2.0
1414
github.com/pelletier/go-toml v1.9.5
1515
github.com/pkg/errors v0.9.1
1616
github.com/sirupsen/logrus v1.9.3
1717
github.com/stretchr/testify v1.9.0
18-
github.com/urfave/cli/v2 v2.27.2
19-
k8s.io/cri-api v0.30.1
18+
github.com/urfave/cli/v2 v2.27.4
19+
k8s.io/cri-api v0.31.1
2020
)
2121

2222
// containerd still uses the v1alpha2 APIs in k8s.io/cri-api.
@@ -25,41 +25,40 @@ require (
2525
replace k8s.io/cri-api => k8s.io/cri-api v0.27.14
2626

2727
require (
28-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
29-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
30-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
28+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
29+
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
3130
github.com/Microsoft/go-winio v0.6.2 // indirect
32-
github.com/Microsoft/hcsshim v0.11.7 // indirect
31+
github.com/Microsoft/hcsshim v0.12.6 // indirect
3332
github.com/beorn7/perks v1.0.1 // indirect
3433
github.com/blang/semver/v4 v4.0.0 // indirect
3534
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36-
github.com/cilium/ebpf v0.15.0 // indirect
37-
github.com/containerd/cgroups v1.1.0 // indirect
38-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
35+
github.com/cilium/ebpf v0.16.0 // indirect
36+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
3937
github.com/containerd/containerd/api v1.7.19 // indirect
4038
github.com/containerd/continuity v0.4.3 // indirect
4139
github.com/containerd/fifo v1.1.0 // indirect
42-
github.com/containerd/go-cni v1.1.9 // indirect
40+
github.com/containerd/go-cni v1.1.10 // indirect
4341
github.com/containerd/imgcrypt v1.1.11 // indirect
4442
github.com/containerd/nri v0.6.1 // indirect
4543
github.com/containerd/platforms v0.2.1 // indirect
4644
github.com/containerd/ttrpc v1.2.5 // indirect
4745
github.com/containerd/typeurl v1.0.2 // indirect
48-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
49-
github.com/containernetworking/cni v1.2.0 // indirect
50-
github.com/containernetworking/plugins v1.4.0 // indirect
51-
github.com/containers/ocicrypt v1.1.10 // indirect
46+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
47+
github.com/containernetworking/cni v1.2.3 // indirect
48+
github.com/containernetworking/plugins v1.5.1 // indirect
49+
github.com/containers/ocicrypt v1.2.0 // indirect
5250
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5351
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
54-
github.com/davecgh/go-spew v1.1.1 // indirect
52+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5553
github.com/distribution/reference v0.6.0 // indirect
5654
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
5755
github.com/docker/go-metrics v0.0.1 // indirect
5856
github.com/docker/go-units v0.5.0 // indirect
5957
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
60-
github.com/felixge/httpsnoop v1.0.3 // indirect
58+
github.com/felixge/httpsnoop v1.0.4 // indirect
6159
github.com/fsnotify/fsnotify v1.7.0 // indirect
62-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
60+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
61+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
6362
github.com/go-logr/logr v1.4.2 // indirect
6463
github.com/go-logr/stdr v1.2.2 // indirect
6564
github.com/godbus/dbus/v5 v5.1.0 // indirect
@@ -69,75 +68,78 @@ require (
6968
github.com/google/go-cmp v0.6.0 // indirect
7069
github.com/google/gofuzz v1.2.0 // indirect
7170
github.com/google/uuid v1.6.0 // indirect
72-
github.com/gorilla/websocket v1.5.1 // indirect
71+
github.com/gorilla/websocket v1.5.3 // indirect
7372
github.com/hashicorp/errwrap v1.1.0 // indirect
7473
github.com/hashicorp/go-multierror v1.1.1 // indirect
7574
github.com/htcat/htcat v1.0.2 // indirect
7675
github.com/intel/goresctrl v0.7.0 // indirect
7776
github.com/jmespath/go-jmespath v0.4.0 // indirect
7877
github.com/json-iterator/go v1.1.12 // indirect
79-
github.com/klauspost/compress v1.17.8 // indirect
78+
github.com/klauspost/compress v1.17.9 // indirect
8079
github.com/miekg/pkcs11 v1.1.1 // indirect
8180
github.com/moby/locker v1.0.1 // indirect
82-
github.com/moby/spdystream v0.2.0 // indirect
83-
github.com/moby/sys/mountinfo v0.7.1 // indirect
84-
github.com/moby/sys/sequential v0.5.0 // indirect
85-
github.com/moby/sys/signal v0.7.0 // indirect
86-
github.com/moby/sys/symlink v0.2.0 // indirect
87-
github.com/moby/sys/user v0.1.0 // indirect
81+
github.com/moby/spdystream v0.5.0 // indirect
82+
github.com/moby/sys/mountinfo v0.7.2 // indirect
83+
github.com/moby/sys/sequential v0.6.0 // indirect
84+
github.com/moby/sys/signal v0.7.1 // indirect
85+
github.com/moby/sys/symlink v0.3.0 // indirect
86+
github.com/moby/sys/user v0.3.0 // indirect
87+
github.com/moby/sys/userns v0.1.0 // indirect
8888
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8989
github.com/modern-go/reflect2 v1.0.2 // indirect
90+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9091
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9192
github.com/opencontainers/go-digest v1.0.0 // indirect
9293
github.com/opencontainers/image-spec v1.1.0 // indirect
9394
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
9495
github.com/opencontainers/selinux v1.11.0 // indirect
95-
github.com/pmezard/go-difflib v1.0.0 // indirect
96-
github.com/prometheus/client_golang v1.19.1 // indirect
96+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
97+
github.com/prometheus/client_golang v1.20.3 // indirect
9798
github.com/prometheus/client_model v0.6.1 // indirect
98-
github.com/prometheus/common v0.53.0 // indirect
99-
github.com/prometheus/procfs v0.15.0 // indirect
99+
github.com/prometheus/common v0.59.1 // indirect
100+
github.com/prometheus/procfs v0.15.1 // indirect
100101
github.com/russross/blackfriday/v2 v2.1.0 // indirect
101102
github.com/spf13/pflag v1.0.5 // indirect
102103
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
103104
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
104105
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
105-
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
106+
github.com/vishvananda/netlink v1.3.0 // indirect
106107
github.com/vishvananda/netns v0.0.4 // indirect
108+
github.com/x448/float16 v0.8.4 // indirect
107109
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
108-
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
110+
go.mozilla.org/pkcs7 v0.9.0 // indirect
109111
go.opencensus.io v0.24.0 // indirect
110-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
111-
go.opentelemetry.io/otel v1.21.0 // indirect
112-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
113-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
114-
golang.org/x/crypto v0.24.0 // indirect
115-
golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 // indirect
116-
golang.org/x/mod v0.17.0 // indirect
117-
golang.org/x/net v0.26.0 // indirect
118-
golang.org/x/oauth2 v0.20.0 // indirect
119-
golang.org/x/sync v0.7.0 // indirect
120-
golang.org/x/sys v0.21.0 // indirect
121-
golang.org/x/term v0.21.0 // indirect
122-
golang.org/x/text v0.16.0 // indirect
123-
golang.org/x/time v0.5.0 // indirect
124-
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
126-
google.golang.org/grpc v1.64.1 // indirect
127-
google.golang.org/protobuf v1.34.1 // indirect
112+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
113+
go.opentelemetry.io/otel v1.30.0 // indirect
114+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
115+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
116+
golang.org/x/crypto v0.27.0 // indirect
117+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
118+
golang.org/x/mod v0.21.0 // indirect
119+
golang.org/x/net v0.29.0 // indirect
120+
golang.org/x/oauth2 v0.23.0 // indirect
121+
golang.org/x/sync v0.8.0 // indirect
122+
golang.org/x/sys v0.25.0 // indirect
123+
golang.org/x/term v0.24.0 // indirect
124+
golang.org/x/text v0.18.0 // indirect
125+
golang.org/x/time v0.6.0 // indirect
126+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128+
google.golang.org/grpc v1.66.2 // indirect
129+
google.golang.org/protobuf v1.34.2 // indirect
128130
gopkg.in/inf.v0 v0.9.1 // indirect
129131
gopkg.in/yaml.v2 v2.4.0 // indirect
130132
gopkg.in/yaml.v3 v3.0.1 // indirect
131-
k8s.io/api v0.30.1 // indirect
132-
k8s.io/apimachinery v0.30.1 // indirect
133-
k8s.io/apiserver v0.30.1 // indirect
134-
k8s.io/client-go v0.30.1 // indirect
135-
k8s.io/component-base v0.30.1 // indirect
136-
k8s.io/klog/v2 v2.120.1 // indirect
137-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
133+
k8s.io/api v0.31.1 // indirect
134+
k8s.io/apimachinery v0.31.1 // indirect
135+
k8s.io/apiserver v0.31.1 // indirect
136+
k8s.io/client-go v0.31.1 // indirect
137+
k8s.io/component-base v0.31.1 // indirect
138+
k8s.io/klog/v2 v2.130.1 // indirect
139+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
138140
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139141
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
140142
sigs.k8s.io/yaml v1.4.0 // indirect
141-
tags.cncf.io/container-device-interface v0.7.2 // indirect
142-
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
143+
tags.cncf.io/container-device-interface v0.8.0 // indirect
144+
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
143145
)

0 commit comments

Comments
 (0)