Skip to content

Commit 32e9bfc

Browse files
authored
Merge pull request #3237 from jsternberg/vendor-update
vendor: github.com/moby/buildkit v0.23.0-rc1
2 parents 1e96997 + e1adeee commit 32e9bfc

File tree

1,145 files changed

+63990
-35724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,145 files changed

+63990
-35724
lines changed

build/provenance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
type provenancePredicate struct {
2626
Builder *provenanceBuilder `json:"builder,omitempty"`
27-
provenancetypes.ProvenancePredicate
27+
provenancetypes.ProvenancePredicateSLSA02
2828
}
2929

3030
type provenanceBuilder struct {

commands/history/inspect.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ workers0:
434434
if err != nil {
435435
return errors.Errorf("failed to read provenance %s: %v", prov.descr.Digest, err)
436436
}
437-
var pred provenancetypes.ProvenancePredicate
437+
var pred provenancetypes.ProvenancePredicateSLSA02
438438
if err := json.Unmarshal(dt, &pred); err != nil {
439439
return errors.Errorf("failed to unmarshal provenance %s: %v", prov.descr.Digest, err)
440440
}
@@ -836,6 +836,7 @@ func ociDesc(in *controlapi.Descriptor) ocispecs.Descriptor {
836836
Annotations: in.Annotations,
837837
}
838838
}
839+
839840
func descrType(desc ocispecs.Descriptor) string {
840841
if typ, ok := desc.Annotations["in-toto.io/predicate-type"]; ok {
841842
return typ

go.mod

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/Microsoft/go-winio v0.6.2
88
github.com/aws/aws-sdk-go-v2/config v1.27.27
99
github.com/compose-spec/compose-go/v2 v2.6.3
10-
github.com/containerd/console v1.0.4
11-
github.com/containerd/containerd/v2 v2.0.5
10+
github.com/containerd/console v1.0.5
11+
github.com/containerd/containerd/v2 v2.1.1
1212
github.com/containerd/continuity v0.4.5
1313
github.com/containerd/errdefs v1.0.0
1414
github.com/containerd/log v0.1.0
@@ -26,9 +26,9 @@ require (
2626
github.com/hashicorp/go-cty-funcs v0.0.0-20250210171435-dda779884a9f
2727
github.com/hashicorp/go-multierror v1.1.1
2828
github.com/hashicorp/hcl/v2 v2.23.0
29-
github.com/in-toto/in-toto-golang v0.5.0
29+
github.com/in-toto/in-toto-golang v0.9.0
3030
github.com/mitchellh/hashstructure/v2 v2.0.2
31-
github.com/moby/buildkit v0.22.0
31+
github.com/moby/buildkit v0.23.0-rc1
3232
github.com/moby/go-archive v0.1.0
3333
github.com/moby/sys/atomicwriter v0.1.0
3434
github.com/moby/sys/mountinfo v0.7.2
@@ -44,33 +44,32 @@ require (
4444
github.com/spf13/cobra v1.9.1
4545
github.com/spf13/pflag v1.0.6
4646
github.com/stretchr/testify v1.10.0
47-
github.com/tonistiigi/fsutil v0.0.0-20250417144416-3f76f8130144
48-
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
47+
github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f
48+
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0
4949
github.com/tonistiigi/jaeger-ui-rest v0.0.0-20250408171107-3dd17559e117
5050
github.com/zclconf/go-cty v1.16.2
51-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0
52-
go.opentelemetry.io/otel v1.31.0
51+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
52+
go.opentelemetry.io/otel v1.35.0
5353
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0
54-
go.opentelemetry.io/otel/metric v1.31.0
55-
go.opentelemetry.io/otel/sdk v1.31.0
56-
go.opentelemetry.io/otel/trace v1.31.0
54+
go.opentelemetry.io/otel/metric v1.35.0
55+
go.opentelemetry.io/otel/sdk v1.35.0
56+
go.opentelemetry.io/otel/trace v1.35.0
5757
golang.org/x/mod v0.24.0
58-
golang.org/x/sync v0.13.0
59-
golang.org/x/sys v0.32.0
58+
golang.org/x/sync v0.14.0
59+
golang.org/x/sys v0.33.0
6060
golang.org/x/term v0.31.0
6161
golang.org/x/text v0.24.0
62-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
63-
google.golang.org/grpc v1.69.4
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a
63+
google.golang.org/grpc v1.72.2
6464
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
65-
google.golang.org/protobuf v1.35.2
65+
google.golang.org/protobuf v1.36.6
6666
gopkg.in/yaml.v3 v3.0.1
67-
k8s.io/api v0.31.2
68-
k8s.io/apimachinery v0.31.2
69-
k8s.io/client-go v0.31.2
67+
k8s.io/api v0.32.3
68+
k8s.io/apimachinery v0.32.3
69+
k8s.io/client-go v0.32.3
7070
)
7171

7272
require (
73-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
7473
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
7574
github.com/agext/levenshtein v1.2.3 // indirect
7675
github.com/apparentlymart/go-cidr v1.0.1 // indirect
@@ -88,7 +87,7 @@ require (
8887
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
8988
github.com/aws/smithy-go v1.20.3 // indirect
9089
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
91-
github.com/containerd/containerd/api v1.8.0 // indirect
90+
github.com/containerd/containerd/api v1.9.0 // indirect
9291
github.com/containerd/errdefs/pkg v0.3.0 // indirect
9392
github.com/containerd/ttrpc v1.2.7 // indirect
9493
github.com/containerd/typeurl/v2 v2.2.3 // indirect
@@ -102,20 +101,19 @@ require (
102101
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
103102
github.com/go-logr/logr v1.4.2 // indirect
104103
github.com/go-logr/stdr v1.2.2 // indirect
105-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
104+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
106105
github.com/go-openapi/jsonreference v0.20.2 // indirect
107-
github.com/go-openapi/swag v0.22.4 // indirect
106+
github.com/go-openapi/swag v0.23.0 // indirect
108107
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
109108
github.com/gogo/protobuf v1.3.2 // indirect
110109
github.com/golang/protobuf v1.5.4 // indirect
111110
github.com/google/gnostic-models v0.6.8 // indirect
112111
github.com/google/go-cmp v0.7.0 // indirect
113112
github.com/google/gofuzz v1.2.0 // indirect
114113
github.com/gorilla/websocket v1.5.0 // indirect
115-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
114+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
116115
github.com/hashicorp/errwrap v1.1.0 // indirect
117116
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
118-
github.com/imdario/mergo v0.3.16 // indirect
119117
github.com/inconshreveable/mousetrap v1.1.0 // indirect
120118
github.com/josharian/intern v1.0.0 // indirect
121119
github.com/json-iterator/go v1.1.12 // indirect
@@ -140,7 +138,7 @@ require (
140138
github.com/pmezard/go-difflib v1.0.0 // indirect
141139
github.com/rivo/uniseg v0.2.0 // indirect
142140
github.com/russross/blackfriday/v2 v2.1.0 // indirect
143-
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
141+
github.com/secure-systems-lab/go-securesystemslib v0.6.0 // indirect
144142
github.com/shibumi/go-pathspec v1.3.0 // indirect
145143
github.com/theupdateframework/notary v0.7.0 // indirect
146144
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect
@@ -151,28 +149,29 @@ require (
151149
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
152150
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
153151
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
154-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
152+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
153+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
155154
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
156155
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
157156
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect
158-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
159-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
160-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
161-
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
162-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
159+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
160+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
161+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
163162
golang.org/x/crypto v0.37.0 // indirect
164163
golang.org/x/net v0.39.0 // indirect
165164
golang.org/x/oauth2 v0.29.0 // indirect
166165
golang.org/x/time v0.11.0 // indirect
167166
golang.org/x/tools v0.32.0 // indirect
168-
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
167+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
168+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
169169
gopkg.in/inf.v0 v0.9.1 // indirect
170-
gopkg.in/yaml.v2 v2.4.0 // indirect
171170
k8s.io/klog/v2 v2.130.1 // indirect
172-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
173-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
174-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
175-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
171+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
172+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
173+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
174+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
176175
sigs.k8s.io/yaml v1.4.0 // indirect
177176
)
178177

0 commit comments

Comments
 (0)