Merge branch 'develop' into WIP-containerd-2.0

cloudfoundry · Dec 18, 2024 · a836b4b · a836b4b
2 parents f4ad062 + 1948fea
commit a836b4b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/packages/containerd/spec b/packages/containerd/spec
@@ -5,4 +5,5 @@ dependencies:
   - golang-1.23-linux
 
 files:
-  - containerd/**/*
+
+  - containerd/**/*
diff --git a/packages/gats/spec b/packages/gats/spec
@@ -165,6 +165,7 @@ files:
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/impl/*.go # gosub
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/order/*.go # gosub
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/pragma/*.go # gosub
+  - garden-integration-tests/vendor/google.golang.org/protobuf/internal/protolazy/*.go # gosub
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/set/*.go # gosub
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/strs/*.go # gosub
   - garden-integration-tests/vendor/google.golang.org/protobuf/internal/version/*.go # gosub

diff --git a/packages/grootfs/spec b/packages/grootfs/spec
@@ -171,6 +171,7 @@ files:
   - grootfs/vendor/google.golang.org/protobuf/internal/impl/*.go # gosub
   - grootfs/vendor/google.golang.org/protobuf/internal/order/*.go # gosub
   - grootfs/vendor/google.golang.org/protobuf/internal/pragma/*.go # gosub
+  - grootfs/vendor/google.golang.org/protobuf/internal/protolazy/*.go # gosub
   - grootfs/vendor/google.golang.org/protobuf/internal/set/*.go # gosub
   - grootfs/vendor/google.golang.org/protobuf/internal/strs/*.go # gosub
   - grootfs/vendor/google.golang.org/protobuf/internal/version/*.go # gosub

diff --git a/packages/runc/spec b/packages/runc/spec
@@ -109,6 +109,7 @@ files:
   - guardian/vendor/google.golang.org/protobuf/internal/impl/*.go # gosub
   - guardian/vendor/google.golang.org/protobuf/internal/order/*.go # gosub
   - guardian/vendor/google.golang.org/protobuf/internal/pragma/*.go # gosub
+  - guardian/vendor/google.golang.org/protobuf/internal/protolazy/*.go # gosub
   - guardian/vendor/google.golang.org/protobuf/internal/set/*.go # gosub
   - guardian/vendor/google.golang.org/protobuf/internal/strs/*.go # gosub
   - guardian/vendor/google.golang.org/protobuf/internal/version/*.go # gosub

diff --git a/src/garden b/src/garden
diff --git a/src/garden-integration-tests b/src/garden-integration-tests
diff --git a/src/garden-performance-acceptance-tests b/src/garden-performance-acceptance-tests
diff --git a/src/grootfs b/src/grootfs
diff --git a/src/guardian b/src/guardian
diff --git a/src/thresholder/go.sum b/src/thresholder/go.sum
@@ -33,8 +33,8 @@ golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
 golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+2 −2		go.mod
+4 −4		go.sum
+ −		vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
+3 −0		vendor/google.golang.org/protobuf/internal/filedesc/desc.go
+4 −0		vendor/google.golang.org/protobuf/internal/filedesc/editions.go
+17 −0		vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go
+12 −0		vendor/google.golang.org/protobuf/internal/genid/name.go
+128 −0		vendor/google.golang.org/protobuf/internal/impl/api_export_opaque.go
+34 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap.go
+126 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap_race.go
+33 −0		vendor/google.golang.org/protobuf/internal/impl/checkinit.go
+264 −0		vendor/google.golang.org/protobuf/internal/impl/codec_field_opaque.go
+13 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message.go
+156 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message_opaque.go
+52 −4		vendor/google.golang.org/protobuf/internal/impl/decode.go
+78 −0		vendor/google.golang.org/protobuf/internal/impl/encode.go
+433 −0		vendor/google.golang.org/protobuf/internal/impl/lazy.go
+27 −0		vendor/google.golang.org/protobuf/internal/impl/merge.go
+12 −0		vendor/google.golang.org/protobuf/internal/impl/message.go
+614 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque.go
+132 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque_gen.go
+8 −1		vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
+13 −19		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field.go
+273 −0		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field_gen.go
+9 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
+42 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe_opaque.go
+142 −0		vendor/google.golang.org/protobuf/internal/impl/presence.go
+16 −0		vendor/google.golang.org/protobuf/internal/impl/validate.go
+364 −0		vendor/google.golang.org/protobuf/internal/protolazy/bufferreader.go
+359 −0		vendor/google.golang.org/protobuf/internal/protolazy/lazy.go
+17 −0		vendor/google.golang.org/protobuf/internal/protolazy/pointer_unsafe.go
+2 −2		vendor/google.golang.org/protobuf/internal/version/version.go
+16 −0		vendor/google.golang.org/protobuf/proto/decode.go
+2 −1		vendor/google.golang.org/protobuf/proto/encode.go
+8 −0		vendor/google.golang.org/protobuf/proto/size.go
+80 −0		vendor/google.golang.org/protobuf/proto/wrapperopaque.go
+1 −1		vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
+16 −0		vendor/google.golang.org/protobuf/runtime/protoiface/methods.go
+4 −0		vendor/google.golang.org/protobuf/runtime/protoimpl/impl.go
+3 −2		vendor/modules.txt
+7 −7		go.mod
+12 −12		go.sum
+24 −1		vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.md
+1 −1		vendor/github.com/cyphar/filepath-securejoin/VERSION
+18 −0		vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_go120.go
+38 −0		vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_unsupported.go
+32 −0		vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_go121.go
+124 −0		vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_unsupported.go
+1 −2		vendor/github.com/cyphar/filepath-securejoin/lookup_linux.go
+7 −4		vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.go
+1 −2		vendor/github.com/cyphar/filepath-securejoin/openat2_linux.go
+21 −9		vendor/github.com/cyphar/filepath-securejoin/procfs_linux.go
+ −		vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
+3 −0		vendor/google.golang.org/protobuf/internal/filedesc/desc.go
+4 −0		vendor/google.golang.org/protobuf/internal/filedesc/editions.go
+17 −0		vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go
+12 −0		vendor/google.golang.org/protobuf/internal/genid/name.go
+128 −0		vendor/google.golang.org/protobuf/internal/impl/api_export_opaque.go
+34 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap.go
+126 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap_race.go
+33 −0		vendor/google.golang.org/protobuf/internal/impl/checkinit.go
+264 −0		vendor/google.golang.org/protobuf/internal/impl/codec_field_opaque.go
+13 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message.go
+156 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message_opaque.go
+52 −4		vendor/google.golang.org/protobuf/internal/impl/decode.go
+78 −0		vendor/google.golang.org/protobuf/internal/impl/encode.go
+433 −0		vendor/google.golang.org/protobuf/internal/impl/lazy.go
+27 −0		vendor/google.golang.org/protobuf/internal/impl/merge.go
+12 −0		vendor/google.golang.org/protobuf/internal/impl/message.go
+614 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque.go
+132 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque_gen.go
+8 −1		vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
+13 −19		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field.go
+273 −0		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field_gen.go
+9 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
+42 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe_opaque.go
+142 −0		vendor/google.golang.org/protobuf/internal/impl/presence.go
+16 −0		vendor/google.golang.org/protobuf/internal/impl/validate.go
+364 −0		vendor/google.golang.org/protobuf/internal/protolazy/bufferreader.go
+359 −0		vendor/google.golang.org/protobuf/internal/protolazy/lazy.go
+17 −0		vendor/google.golang.org/protobuf/internal/protolazy/pointer_unsafe.go
+2 −2		vendor/google.golang.org/protobuf/internal/version/version.go
+16 −0		vendor/google.golang.org/protobuf/proto/decode.go
+2 −1		vendor/google.golang.org/protobuf/proto/encode.go
+8 −0		vendor/google.golang.org/protobuf/proto/size.go
+80 −0		vendor/google.golang.org/protobuf/proto/wrapperopaque.go
+1 −1		vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
+16 −0		vendor/google.golang.org/protobuf/runtime/protoiface/methods.go
+4 −0		vendor/google.golang.org/protobuf/runtime/protoimpl/impl.go
+9 −8		vendor/modules.txt
+6 −6		go.mod
+12 −12		go.sum
+2 −2		vendor/code.cloudfoundry.org/idmapper/README.md
+10 −1		vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go
+20 −38		vendor/golang.org/x/exp/maps/maps.go
+ −		vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
+3 −0		vendor/google.golang.org/protobuf/internal/filedesc/desc.go
+4 −0		vendor/google.golang.org/protobuf/internal/filedesc/editions.go
+17 −0		vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go
+12 −0		vendor/google.golang.org/protobuf/internal/genid/name.go
+128 −0		vendor/google.golang.org/protobuf/internal/impl/api_export_opaque.go
+34 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap.go
+126 −0		vendor/google.golang.org/protobuf/internal/impl/bitmap_race.go
+33 −0		vendor/google.golang.org/protobuf/internal/impl/checkinit.go
+264 −0		vendor/google.golang.org/protobuf/internal/impl/codec_field_opaque.go
+13 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message.go
+156 −0		vendor/google.golang.org/protobuf/internal/impl/codec_message_opaque.go
+52 −4		vendor/google.golang.org/protobuf/internal/impl/decode.go
+78 −0		vendor/google.golang.org/protobuf/internal/impl/encode.go
+433 −0		vendor/google.golang.org/protobuf/internal/impl/lazy.go
+27 −0		vendor/google.golang.org/protobuf/internal/impl/merge.go
+12 −0		vendor/google.golang.org/protobuf/internal/impl/message.go
+614 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque.go
+132 −0		vendor/google.golang.org/protobuf/internal/impl/message_opaque_gen.go
+8 −1		vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
+13 −19		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field.go
+273 −0		vendor/google.golang.org/protobuf/internal/impl/message_reflect_field_gen.go
+9 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
+42 −0		vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe_opaque.go
+142 −0		vendor/google.golang.org/protobuf/internal/impl/presence.go
+16 −0		vendor/google.golang.org/protobuf/internal/impl/validate.go
+364 −0		vendor/google.golang.org/protobuf/internal/protolazy/bufferreader.go
+359 −0		vendor/google.golang.org/protobuf/internal/protolazy/lazy.go
+17 −0		vendor/google.golang.org/protobuf/internal/protolazy/pointer_unsafe.go
+2 −2		vendor/google.golang.org/protobuf/internal/version/version.go
+16 −0		vendor/google.golang.org/protobuf/proto/decode.go
+2 −1		vendor/google.golang.org/protobuf/proto/encode.go
+8 −0		vendor/google.golang.org/protobuf/proto/size.go
+80 −0		vendor/google.golang.org/protobuf/proto/wrapperopaque.go
+1 −1		vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
+16 −0		vendor/google.golang.org/protobuf/runtime/protoiface/methods.go
+4 −0		vendor/google.golang.org/protobuf/runtime/protoimpl/impl.go
+9 −8		vendor/modules.txt