github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,325 Commits 3 Branches 2 Tags 112 MiB
d34725f85a
Commit Graph

13325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
6111b5ea8e
Merge pull request #6842 from henry118/fifo 
cri: close fifos when container is deleted
 2022-04-22 16:28:32 +01:00
Henry Wang
8710d4d014 cri: close fifos when container is deleted 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2022-04-21 21:46:50 +00:00
Derek McGowan
7f8506a4f9
Merge pull request #6832 from kzys/imgcrypt-typeurl 
diff: hide types.Any from clients
 2022-04-21 12:11:45 -07:00
Phil Estes
0c2b6a102a
Merge pull request #6838 from bsdnet/cos 
Add Container-Optimized OS into Adopters
 2022-04-21 16:24:09 +01:00
Roy Yang
7331b2af4c Add Container-Optimized OS into Adopters 
Signed-off-by: Roy Yang <cdyhaj799@gmail.com>
 2022-04-21 07:26:52 -07:00
Kazuyoshi Kato
dfa6e8763e diff: hide types.Any from clients 
This commit hides types.Any from the diff package's interface. Clients
(incl. imgcrypt) shouldn't aware about gogo/protobuf.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-21 13:43:20 +00:00
Phil Estes
320ef912bc
Merge pull request #6835 from kzys/proto-upgrade-5 
Prepare for google.golang.org/protobuf
 2022-04-21 14:24:04 +01:00
Kazuyoshi Kato
01dfb110c4 Add go_package on all proto files 
Seems it is no longer optional after migratring off from
gogo/protobuf (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-20 17:29:15 +00:00
Kazuyoshi Kato
aa1526defc Use proto.Marshal instead of calling Marshal() on objects 
With google.golang.org/protobuf, proto-generated objects only have
ProtoReflect(). They don't have Marshal() anymore (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-20 17:14:24 +00:00
Kazuyoshi Kato
95dde4959d Embed "Unimplemented" structs as proto recommended 
Embedding these structs will be mandatory after migratring off from
gogo/protobuf (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-20 17:14:23 +00:00
Phil Estes
1a236784dc
Merge pull request #6833 from Junnplus/monitor-restart 
fix the restart desired to running when task not found
 2022-04-20 18:09:22 +01:00
Phil Estes
eb66262121
Merge pull request #6829 from kzys/always-ptr 
Remove all gogoproto extensions
 2022-04-20 14:45:46 +01:00
Ye Sijun
35994a475c
fix monitor restart 
Signed-off-by: Ye Sijun <junnplus@gmail.com>
 2022-04-20 21:44:29 +08:00
Fu Wei
d85ac56050
Merge pull request #6830 from Junnplus/fix-monitor 2022-04-20 15:56:04 +08:00
Kazuyoshi Kato
237ef0de9b Remove all gogoproto extensions 
This commit removes the following gogoproto extensions;

- gogoproto.nullable
- gogoproto.customename
- gogoproto.unmarshaller_all
- gogoproto.stringer_all
- gogoproto.sizer_all
- gogoproto.marshaler_all
- gogoproto.goproto_unregonized_all
- gogoproto.goproto_stringer_all
- gogoproto.goproto_getters_all

None of them are supported by Google's toolchain (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-20 07:23:28 +00:00
Ye Sijun
22cd13b370
fix nil pointer panic for monitor 
Signed-off-by: Ye Sijun <junnplus@gmail.com>
 2022-04-20 15:04:36 +08:00
Fu Wei
9b33526ef6
Merge pull request #5681 from kzys/info-url 
remotes/docker: log registry URLs as info instead of debug
 2022-04-20 14:21:15 +08:00
Fu Wei
fe7f0aeef4
Merge pull request #6827 from mxpv/renames 2022-04-20 14:06:29 +08:00
Derek McGowan
809549e566
Merge pull request #6828 from kzys/fix-fieldpath 
Fix protoc-gen-go-fieldpath
 2022-04-19 21:48:09 -07:00
Maksym Pavlenko
bd90ce043b Keep shim API backward compatible 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-19 18:46:02 -07:00
Derek McGowan
39692e7672
unpack: return error when no platforms defined 
Require platforms to be non-empty to avoid no-op unpack

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-19 18:21:57 -07:00
Derek McGowan
8017daa12d
Add unpack interface to be used by client 
Move client unpacker to pkg/unpack

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-19 18:21:57 -07:00
Maksym Pavlenko
e2fd25f3d8 Move runtime v2 proto 
Move runtime v2 protos to api/runtime package.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-19 17:59:33 -07:00
Kazuyoshi Kato
3742c756e8 Don't generate a Go file, if that would be empty 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 22:15:45 +00:00
Kazuyoshi Kato
5f3b724323 Fix protoc-gen-go-fieldpath 
The generator has to handle nested fields such as
902212651b/api/events/container.proto (L31-L35).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 22:11:03 +00:00
Derek McGowan
3b82f9e33c
metadata: use resource max and end on registration 
Ensure the registered resource type does not conflict
with existing resource types or over the max.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-19 14:25:31 -07:00
Derek McGowan
902212651b
Merge pull request #6826 from kzys/ptypes 
Consolidate gogo/protobuf dependencies under our own protobuf package
 2022-04-19 10:13:56 -07:00
Fu Wei
9503d7219e
Merge pull request #6744 from Junnplus/restart-policy 
Add restart policy for enhanced restart manager
 2022-04-20 00:12:31 +08:00
Kazuyoshi Kato
88c0c7201e Consolidate gogo/protobuf dependencies under our own protobuf package 
This would make gogo/protobuf migration easier.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 15:53:36 +00:00
Phil Estes
184883b0a6
Merge pull request #6821 from kzys/remove-std-time 
Remove gogoproto.stdtime
 2022-04-19 16:37:07 +01:00
Kazuyoshi Kato
80b825ca2c Remove gogoproto.stdtime 
This commit removes gogoproto.stdtime, since it is not supported by
Google's official toolchain
(see https://github.com/containerd/containerd/issues/6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 13:39:30 +00:00
Phil Estes
45b868927c
Merge pull request #6781 from phanhuy1502/metrics-collector-stats-timeout 
Set timeout when collecting metrics from shim's Stat
 2022-04-19 14:27:36 +01:00
Fu Wei
26a3ab446b
Merge pull request #6819 from kzys/native-fuzz-filter 
Fuzz filter package with Go 1.18's fuzzer
 2022-04-19 21:25:13 +08:00
Phil Estes
476b9c78a3
Merge pull request #6810 from henry118/ptrace 
allow ptrace(2) by default for kernel >= 4.8
 2022-04-19 14:23:53 +01:00
Phil Estes
4ea2202c44
Merge pull request #6820 from kzys/gen-manpages 
Build bin/gen-manpages instead of using "go run"
 2022-04-19 14:22:55 +01:00
Phil Estes
22655d4583
Merge pull request #6822 from thaJeztah/bump_golang_1.18.1 
update golang to 1.18.1, 1.17.9
 2022-04-19 14:17:55 +01:00
Sebastiaan van Stijn
dbdf50cc09
update golang to 1.18.1, 1.17.9 
go1.18.1 (released 2022-04-12) includes security fixes to the crypto/elliptic,
crypto/x509, and encoding/pem packages, as well as bug fixes to the compiler,
linker, runtime, the go command, vet, and the bytes, crypto/x509, and go/types
packages. See the Go 1.18.1 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.18.1+label%3ACherryPickApproved

Includes fixes for:

- CVE-2022-24675 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24675)
- CVE-2022-27536 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-27536)
- CVE-2022-28327 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28327)

go1.17.9 (released 2022-04-12) includes security fixes to the crypto/elliptic
and encoding/pem packages, as well as bug fixes to the linker and runtime. See
the Go 1.17.9 milestone on the issue tracker for details:

Includes fixes for:

- CVE-2022-24675 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24675)
- CVE-2022-28327 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28327)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-04-19 09:39:10 +02:00
Derek McGowan
be60973a30
Merge pull request #6703 from mxpv/s 
Sandbox API
 2022-04-18 20:55:06 -07:00
Kazuyoshi Kato
fd704d3341 Build bin/gen-manpages instead of using "go run" 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-18 21:02:27 +00:00
Kazuyoshi Kato
b497e64143 Fuzz filter package with Go 1.18's fuzzer 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-18 20:49:29 +00:00
Henry Wang
94faa70df4 allow ptrace(2) by default for kernel >= 4.8 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2022-04-18 20:45:29 +00:00
Fu Wei
7cbde74432
Merge pull request #6811 from dmcgowan/lease-plugin 2022-04-18 18:26:31 +08:00
Derek McGowan
fe8da6dcaf
Move lease manager plugin to separate package 
Create lease plugin type to separate lease manager from services plugin.
This allows other service plugins to depend on the lease manager.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-15 11:08:47 -07:00
Phil Estes
fed7df1e25
Merge pull request #6807 from shnmorimoto/fix_pool_device_test 
fix pool_device_test
 2022-04-15 18:09:01 +01:00
Derek McGowan
98260e1b18
Merge pull request #6806 from mikebrow/netns-hardening 
check for duplicate nspath possibilities
 2022-04-14 15:02:44 -07:00
Mike Brown
147f0a7e02 check for duplicate nspath possibilities 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2022-04-14 18:33:19 +00:00
Fu Wei
e0abf62710
Merge pull request #6805 from deckhouse/reset-empty-entrypoint 2022-04-14 19:43:06 +08:00
Shinichi Morimoto
942af12032 fix pool_device_test.go 
While executing mke2fs, 'Not enough space to build proposed filesystem while setting up superblock' error is happend on Ubuntu20.04

Signed-off-by: Shinichi Morimoto <shnmorimoto@gmail.com>
 2022-04-14 09:55:29 +09:00
Andrey Klimentyev
5f3ce9512b Do not append []string{""} to command to preserve Docker compatibility 
Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com>
 2022-04-13 13:29:49 +03:00
Derek McGowan
8367f69fb5
Add collectible resources to metadata gc 
Adds a registration function to metadata which allows plugins to
register resources to be garbage collected. These resources allow
defining resources types which are ephemeral and stored outside the
metadata plugin without extending it. The garbage collection of these
resources will not fail the metadata gc process if their removal fails.
These resources may be referenced by existing metadata store resources
but may not be used to reference metadata store resources for the purpose
of preventing garbage collection.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-04-12 18:59:18 -07:00