Skip to content

Commit 32c3e4c

Browse files
simonbairdsimonbaird
authored
Merge pull request #3051 from simonbaird/update-containerd
chore(deps): Update containerd and k8s go modules
2 parents f038a9a + 36e955e commit 32c3e4c

File tree

10 files changed

+733
-688
lines changed

10 files changed

+733
-688
lines changed

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,14 @@ push-snapshot-image: build-snapshot-image ## Push the ec image with the "snapsho
242242
.PHONY: $(ALL_SUPPORTED_IMG_OS_ARCH)
243243
# Targets are in the form of "image_{platform}_{arch}", we set
244244
# TARGETOS={platform}, and TARGETARCH={arch}.
245+
# Pre-evaluate Go cache directories
246+
GOCACHE_DIR:=$(shell go env GOCACHE)
247+
GOMODCACHE_DIR:=$(shell go env GOMODCACHE)
248+
245249
$(ALL_SUPPORTED_IMG_OS_ARCH): TARGETOS=$(word 2,$(subst _, ,$@))
246250
$(ALL_SUPPORTED_IMG_OS_ARCH): TARGETARCH=$(word 3,$(subst _, ,$@))
247251
$(ALL_SUPPORTED_IMG_OS_ARCH):
248-
@podman build -t $(IMAGE_REPO):$(IMAGE_TAG)-$(TARGETOS)-$(TARGETARCH) -f Dockerfile --platform $(TARGETOS)/$(TARGETARCH) --volume "$$(go env GOCACHE)":/go/cache:Z --volume "$$(go env GOMODCACHE)":/go/mod:Z --env GOCACHE=/go/cache --env GOMODCACHE=/go/mod
252+
@podman build -t $(IMAGE_REPO):$(IMAGE_TAG)-$(TARGETOS)-$(TARGETARCH) -f Dockerfile --platform $(TARGETOS)/$(TARGETARCH) --volume "$(GOCACHE_DIR)":/go/cache:Z --volume "$(GOMODCACHE_DIR)":/go/mod:Z --env GOCACHE=/go/cache --env GOMODCACHE=/go/mod
249253

250254
# Currently it shows the following:
251255
# image_linux_amd64

‎acceptance/go.mod‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/sigstore/cosign/v2 v2.4.1
2626
github.com/sigstore/rekor v1.3.6
2727
github.com/sigstore/sigstore v1.8.9
28-
github.com/stretchr/testify v1.10.0
28+
github.com/stretchr/testify v1.11.1
2929
github.com/tektoncd/cli v0.38.0
3030
github.com/tektoncd/pipeline v0.66.0
3131
github.com/testcontainers/testcontainers-go v0.34.0
@@ -34,24 +34,26 @@ require (
3434
github.com/yudai/gojsondiff v1.0.0
3535
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
3636
gopkg.in/go-jose/go-jose.v2 v2.6.3
37-
k8s.io/api v0.32.3
38-
k8s.io/apimachinery v0.32.3
39-
k8s.io/client-go v0.32.3
37+
k8s.io/api v0.34.2
38+
k8s.io/apimachinery v0.34.2
39+
k8s.io/client-go v0.34.2
4040
oras.land/oras-go/v2 v2.6.0
4141
sigs.k8s.io/kind v0.26.0
42-
sigs.k8s.io/kustomize/api v0.18.0
43-
sigs.k8s.io/kustomize/kyaml v0.18.1
44-
sigs.k8s.io/yaml v1.4.0
42+
sigs.k8s.io/kustomize/api v0.20.1
43+
sigs.k8s.io/kustomize/kyaml v0.20.1
44+
sigs.k8s.io/yaml v1.6.0
4545
)
4646

4747
// Maybe less important in acceptance, but it seems sensible to use the fork here too
4848
replace github.com/google/go-containerregistry => github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728
4949

5050
require (
51-
cel.dev/expr v0.20.0 // indirect
51+
cel.dev/expr v0.24.0 // indirect
52+
cloud.google.com/go/kms v1.20.1 // indirect
53+
cloud.google.com/go/longrunning v0.6.2 // indirect
5254
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
5355
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
54-
dario.cat/mergo v1.0.1 // indirect
56+
dario.cat/mergo v1.0.2 // indirect
5557
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5658
github.com/BurntSushi/toml v1.4.0 // indirect
5759
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -71,12 +73,13 @@ require (
7173
github.com/containerd/errdefs v1.0.0 // indirect
7274
github.com/containerd/errdefs/pkg v0.3.0 // indirect
7375
github.com/containerd/log v0.1.0 // indirect
74-
github.com/containerd/platforms v1.0.0-rc.1 // indirect
76+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
7577
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
78+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
7679
github.com/cpuguy83/dockercfg v0.3.2 // indirect
7780
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
7881
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
79-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
82+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
8083
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8184
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
8285
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
@@ -88,18 +91,19 @@ require (
8891
github.com/docker/go-connections v0.5.0 // indirect
8992
github.com/docker/go-units v0.5.0 // indirect
9093
github.com/dustin/go-humanize v1.0.1 // indirect
91-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
94+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
9295
github.com/emirpasic/gods v1.18.1 // indirect
9396
github.com/fatih/color v1.17.0 // indirect
9497
github.com/felixge/httpsnoop v1.0.4 // indirect
9598
github.com/fsnotify/fsnotify v1.9.0 // indirect
96-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
99+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
97100
github.com/gkampitakis/ciinfo v0.3.0 // indirect
98101
github.com/gkampitakis/go-diff v1.3.2 // indirect
99102
github.com/go-chi/chi v4.1.2+incompatible // indirect
100103
github.com/go-errors/errors v1.5.1 // indirect
101104
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
102-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
105+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
106+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
103107
github.com/go-kit/log v0.2.1 // indirect
104108
github.com/go-logfmt/logfmt v0.6.0 // indirect
105109
github.com/go-logr/logr v1.4.3 // indirect
@@ -118,16 +122,14 @@ require (
118122
github.com/gofrs/uuid v4.4.0+incompatible // indirect
119123
github.com/gogo/protobuf v1.3.2 // indirect
120124
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
121-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
125+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
122126
github.com/golang/protobuf v1.5.4 // indirect
123127
github.com/golang/snappy v0.0.4 // indirect
124-
github.com/google/cel-go v0.22.0 // indirect
128+
github.com/google/cel-go v0.26.0 // indirect
125129
github.com/google/certificate-transparency-go v1.2.1 // indirect
126-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
130+
github.com/google/gnostic-models v0.7.0 // indirect
127131
github.com/google/go-cmp v0.7.0 // indirect
128-
github.com/google/gofuzz v1.2.0 // indirect
129132
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
130-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
131133
github.com/google/uuid v1.6.0 // indirect
132134
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
133135
github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect
@@ -140,11 +142,11 @@ require (
140142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
141143
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
142144
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
143-
github.com/jonboulle/clockwork v0.4.0 // indirect
145+
github.com/jonboulle/clockwork v0.5.0 // indirect
144146
github.com/josharian/intern v1.0.0 // indirect
145147
github.com/json-iterator/go v1.1.12 // indirect
146148
github.com/kevinburke/ssh_config v1.2.0 // indirect
147-
github.com/klauspost/compress v1.18.0 // indirect
149+
github.com/klauspost/compress v1.18.1 // indirect
148150
github.com/kr/pretty v0.3.1 // indirect
149151
github.com/kr/text v0.2.0 // indirect
150152
github.com/letsencrypt/boulder v0.0.0-20240830194243-1fcf0ee08180 // indirect
@@ -164,7 +166,7 @@ require (
164166
github.com/moby/sys/userns v0.1.0 // indirect
165167
github.com/moby/term v0.5.0 // indirect
166168
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
167-
github.com/modern-go/reflect2 v1.0.2 // indirect
169+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
168170
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
169171
github.com/morikuni/aec v1.0.0 // indirect
170172
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -179,10 +181,10 @@ require (
179181
github.com/pjbgf/sha1cd v0.3.0 // indirect
180182
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
181183
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
182-
github.com/prometheus/client_golang v1.22.0 // indirect
184+
github.com/prometheus/client_golang v1.23.2 // indirect
183185
github.com/prometheus/client_model v0.6.2 // indirect
184-
github.com/prometheus/common v0.62.0 // indirect
185-
github.com/prometheus/procfs v0.15.1 // indirect
186+
github.com/prometheus/common v0.66.1 // indirect
187+
github.com/prometheus/procfs v0.16.1 // indirect
186188
github.com/prometheus/statsd_exporter v0.27.1 // indirect
187189
github.com/rogpeppe/go-internal v1.13.1 // indirect
188190
github.com/sagikazarmark/locafero v0.7.0 // indirect
@@ -205,6 +207,7 @@ require (
205207
github.com/stretchr/objx v0.5.2 // indirect
206208
github.com/subosito/gotenv v1.6.0 // indirect
207209
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
210+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
208211
github.com/theupdateframework/go-tuf v0.7.0 // indirect
209212
github.com/tidwall/gjson v1.17.3 // indirect
210213
github.com/tidwall/match v1.1.1 // indirect
@@ -223,42 +226,43 @@ require (
223226
go.mongodb.org/mongo-driver v1.16.1 // indirect
224227
go.opencensus.io v0.24.0 // indirect
225228
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
226-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
227229
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
228-
go.opentelemetry.io/otel v1.36.0 // indirect
230+
go.opentelemetry.io/otel v1.37.0 // indirect
229231
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
230-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
231-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
232+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
233+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
232234
go.uber.org/multierr v1.11.0 // indirect
233235
go.uber.org/zap v1.27.0 // indirect
234-
golang.org/x/crypto v0.38.0 // indirect
235-
golang.org/x/mod v0.25.0 // indirect
236-
golang.org/x/net v0.40.0 // indirect
236+
go.yaml.in/yaml/v2 v2.4.2 // indirect
237+
go.yaml.in/yaml/v3 v3.0.4 // indirect
238+
golang.org/x/crypto v0.41.0 // indirect
239+
golang.org/x/mod v0.29.0 // indirect
240+
golang.org/x/net v0.43.0 // indirect
237241
golang.org/x/oauth2 v0.30.0 // indirect
238-
golang.org/x/sync v0.15.0 // indirect
239-
golang.org/x/sys v0.33.0 // indirect
240-
golang.org/x/term v0.32.0 // indirect
241-
golang.org/x/text v0.25.0 // indirect
242-
golang.org/x/time v0.11.0 // indirect
242+
golang.org/x/sync v0.17.0 // indirect
243+
golang.org/x/sys v0.37.0 // indirect
244+
golang.org/x/term v0.34.0 // indirect
245+
golang.org/x/text v0.28.0 // indirect
246+
golang.org/x/time v0.14.0 // indirect
243247
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
244248
google.golang.org/api v0.215.0 // indirect
245-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
246-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
247-
google.golang.org/grpc v1.72.2 // indirect
248-
google.golang.org/protobuf v1.36.6 // indirect
249+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
250+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
251+
google.golang.org/grpc v1.76.0 // indirect
252+
google.golang.org/protobuf v1.36.10 // indirect
249253
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
250254
gopkg.in/inf.v0 v0.9.1 // indirect
251255
gopkg.in/warnings.v0 v0.1.2 // indirect
252256
gopkg.in/yaml.v2 v2.4.0 // indirect
253257
gopkg.in/yaml.v3 v3.0.1 // indirect
254-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
255-
k8s.io/apiserver v0.32.3 // indirect
256-
k8s.io/component-base v0.32.3 // indirect
258+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
259+
k8s.io/cli-runtime v0.34.2 // indirect
257260
k8s.io/klog/v2 v2.130.1 // indirect
258-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
259-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
261+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
262+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
260263
knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c // indirect
261264
sigs.k8s.io/controller-runtime v0.19.0 // indirect
262-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
263-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
265+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
266+
sigs.k8s.io/randfill v1.0.0 // indirect
267+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
264268
)

0 commit comments

Comments
 (0)