Commit Graph

10564 Commits

Author SHA1 Message Date
Justin Terry
227156dac6 Add ctr support for CPUMax and CPUShares
Adds CPU.Maximum and CPU.Shares support to the ctr
cmdline for testing

Signed-off-by: Justin Terry <jlterry@amazon.com>
2022-04-28 13:17:16 -07:00
Phil Estes
0f5d4ff0ff
Merge pull request #6867 from kzys/remove-gogo
Remove github.com/gogo/protobuf and github.com/golang/protobuf from containerd's direct dependencies
2022-04-28 15:34:11 +01:00
Mike Brown
3437ba7574
Merge pull request #6868 from MikeZappa87/issue/update-go-cni
Update go-cni to v1.1.5
2022-04-27 19:03:51 -05:00
Michael Zappa
5d0730370d Update go-cni to v1.1.5
Signed-off-by: Michael Zappa <Michael.Zappa@stateless.net>
2022-04-27 16:27:10 -06:00
Kazuyoshi Kato
cb84b5a1d2
Merge pull request #6865 from log1cb0mb/bump-opencontainers/selinux-to-v1.10.1
Bump opencontainers/selinux from 1.10.0 to 1.10.1
2022-04-27 14:46:21 -07:00
Kazuyoshi Kato
180c7535d7 Upgrade protoc, protoc-gen-go and protoc-gen-go-grpc
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:36:04 +00:00
Kazuyoshi Kato
2c6760005c go mod tidy & go mod vendor
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:31:21 +00:00
Kazuyoshi Kato
29b9379560 make protos
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:31:16 +00:00
Kazuyoshi Kato
fcba486366 Remove gogo from .proto files
While gogo isn't actually used, it is still referenced from .proto files
and its corresponding Go package is imported from the auto-generated
files.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 20:27:55 +00:00
Phil Estes
2a358a4e11
Merge pull request #6864 from kzys/upgrade-proto-and-grpc
Upgrade google.golang.org/grpc and google.golang.org/protobuf
2022-04-27 21:21:17 +01:00
Phil Estes
6348a7bf1e
Merge pull request #6863 from kzys/cirrus-cache
Don't use "uname -a" as Cirrus CI's cache key
2022-04-27 21:18:45 +01:00
log1cb0mb
ae29594d0b Bump opencontainers/selinux from 1.10.0 to 1.10.1
Signed-off-by: Nabeel Rana <nabeelnrana@gmail.com>
2022-04-27 22:55:25 +03:00
Kazuyoshi Kato
7f23296b99 Upgrade google.golang.org/grpc and google.golang.org/protobuf
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 17:25:02 +00:00
Kazuyoshi Kato
7353006f69 Remove kzys/typeurl
I forgot to remove my fork from integration/client/go.mod.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 17:16:51 +00:00
Kazuyoshi Kato
7215f85aca Don't use "uname -a" as Cirrus CI's cache key
"uname -a" includes its hostname, which could be
cirrus-task-6102504847966208, cirrus-task-6665454801387520, ...
This is unnecessary invalidating the cache.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 16:47:39 +00:00
Kazuyoshi Kato
7bd42d226a
Merge pull request #6856 from kangclzjc/container-remove-dup-20220426
remove duplicate
2022-04-27 09:32:08 -07:00
Phil Estes
9da2ce2195
Merge pull request #6858 from mgiessing/main
Create ppc64le release
2022-04-27 16:14:27 +01:00
mgiessing
45c0cbec57
Create ppc64le release
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
2022-04-26 23:34:45 +02:00
Derek McGowan
8e74f2af00
Merge pull request #6854 from kzys/cirrus-ci
Move Vagrant-based tests from GitHub Actions to Cirrus CI
2022-04-26 12:48:39 -07:00
Derek McGowan
6e0231f992
Merge pull request #6150 from fuweid/support-4984
feature: support image pull progress timeout
2022-04-26 12:15:09 -07:00
Kazuyoshi Kato
5f43118cee Move Vagrant-based tests from GitHub Actions to Cirrus CI
Cirrus CI supports nested virtualization and free to use from open
source projects. runc has been using the service since
https://github.com/opencontainers/runc/pull/3088.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-26 17:18:19 +00:00
Wei Fu
00d102da9f feature: support image pull progress timeout
Kubelet sends the PullImage request without timeout, because the image size
is unknown and timeout is hard to defined. The pulling request might run
into 0B/s speed, if containerd can't receive any packet in that connection.
For this case, the containerd should cancel the PullImage request.

Although containerd provides ingester manager to track the progress of pulling
request, for example `ctr image pull` shows the console progress bar, it needs
more CPU resources to open/read the ingested files to get status.

In order to support progress timeout feature with lower overhead, this
patch uses http.RoundTripper wrapper to track active progress. That
wrapper will increase active-request number and return the
countingReadCloser wrapper for http.Response.Body. Each bytes-read
can be count and the active-request number will be descreased when the
countingReadCloser wrapper has been closed. For the progress tracker,
it can check the active-request number and bytes-read at intervals. If
there is no any progress, the progress tracker should cancel the
request.

NOTE: For each blob data, the containerd will make sure that the content
writer is opened before sending http request to the registry. Therefore, the
progress reporter can rely on the active-request number.

fixed: #4984

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-04-27 00:02:27 +08:00
Fu Wei
0d696d2f4b
Merge pull request #6749 from dmcgowan/unpacker-interface 2022-04-26 20:54:51 +08:00
Kang.Zhang
fceab7f4c4 remove duplicate
Signed-off-by: Kang.Zhang <Kang.zhang@intel.com>
2022-04-26 10:44:45 +08:00
Kazuyoshi Kato
d91c4f214e
Merge pull request #6855 from dmcgowan/fix-undefined-error
Fix undefined error in use of errors package
2022-04-25 16:12:37 -07:00
Derek McGowan
0e6c7bf931
Fix undefined error in use of errors package
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-04-25 15:21:21 -07:00
Derek McGowan
3dbd6a2498
Merge pull request #6841 from kzys/proto-upgrade-6
Migrate off from github.com/gogo/protobuf
2022-04-25 15:12:51 -07:00
Kazuyoshi Kato
b5aab78dd1
Merge pull request #6851 from whoreyou/images-typo-20220425
images/image.go: typo
2022-04-25 11:44:49 -07:00
Kazuyoshi Kato
f140400c0e
Merge pull request #5686 from dtnyn/issue-5679
Add flag to allow oci.WithAllDevicesAllowed on PrivilegedWithoutHostDevices
2022-04-25 11:44:01 -07:00
Kazuyoshi Kato
2ca54ee8ae
Merge pull request #6180 from claudiubelu/integration/windows-ip-leak
integration: Adds Windows equivalent for TestSandboxRemoveWithoutIPLeakage
2022-04-25 11:27:31 -07:00
Phil Estes
4ef928a222
Merge pull request #6845 from my-git9/test1
fix incorrect syntax in comments
2022-04-25 14:50:18 +01:00
Kang.Zhang
a9f5190fb1 images/image.go: typo
Signed-off-by: Kang.Zhang <Kang.zhang@intel.com>
2022-04-25 16:16:52 +08:00
xin.li
da3e2f985a fix incorrect syntax in comments
Signed-off-by: xin.li <xin.li@daocloud.io>

Signed-off-by: xin.li <xin.li@daocloud.io>

Signed-off-by: xin.li <xin.li@daocloud.io>
2022-04-25 15:29:37 +08:00
Kazuyoshi Kato
7a4f81d8ba Fix tests
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:41:05 +00:00
Kazuyoshi Kato
aefd1849b6 go mod tidy and go mod vendor
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:41:05 +00:00
Kazuyoshi Kato
f616dd471e Upgrade containerd/typeurl
https://github.com/containerd/typeurl/pull/35 is needed to handle
types generated by protoc-gen-go.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:40:56 +00:00
Kazuyoshi Kato
9dbe000a38 make protos
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:31:53 +00:00
Kazuyoshi Kato
1a095e18ba Rename Size_ to Size
Previouslty "Size" was reserved by protoc-gen-gogoctrd and user-generated
"Size" was automatically renamed to "Size_" to avoid conflicts.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:31:53 +00:00
Kazuyoshi Kato
e3db7de8f5 Remove gogo/protobuf and adjust types
This commit migrates containerd/protobuf from github.com/gogo/protobuf
to google.golang.org/protobuf and adjust types. Proto-generated structs
cannot be passed as values.

Fixes #6564.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:31:53 +00:00
Kazuyoshi Kato
fd37cc75be Use protoc-gen-go instead of protoc-gen-gogoctrd
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:31:53 +00:00
Kazuyoshi Kato
e044759ebd Upgrade containerd/ttrpc
protoc-gen-go-ttrpc's generated Go code doesn't work with ttrpc v1.1.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-22 15:31:52 +00:00
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