Commit Graph

11307 Commits

Author SHA1 Message Date
zounengren
49e2fe2abb bump cri-api
Signed-off-by: zounengren <zouyee1989@gmail.com>
2022-08-25 21:03:55 +08:00
Samuel Karp
36d0cfd0fd
Merge pull request #6517 from ruiwen-zhao/return-resource 2022-08-24 14:01:30 -07:00
Samuel Karp
8ce32aedd8
Merge pull request #7038 from pacoxu/registry-change 2022-08-24 13:04:13 -07:00
ruiwen-zhao
b7b1200dd3 ContainerStatus to return container resources
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-08-24 19:08:06 +00:00
Kazuyoshi Kato
d0c99ff5f1
Merge pull request #7309 from kzys/fuzz-no-rename
Do not rename test files on-the-fly to share functions
2022-08-24 10:30:04 -07:00
Paco Xu
9525b3148a migrate from k8s.gcr.io to registry.k8s.io
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
2022-08-24 13:46:46 +08:00
Samuel Karp
542e4b219d
Merge pull request #6906 from ginglis13/6441-ctr-import 2022-08-23 17:35:40 -07:00
Daniel Canter
f0036cb9dc windows: Add runhcs-wcow-hypervisor runtimeclass to the default config
As part of the effort of getting hypervisor isolated windows container
support working for the CRI entrypoint here, add the runhcs-wcow-hypervisor
handler for the default config. This sets the correct SandboxIsolation
value that the Windows shim uses to differentiate process vs. hypervisor
isolation. This change additionally sets the wcow-process runtime to
passthrough io.microsoft.container* annotations and the hypervisor runtime
to accept io.microsoft.virtualmachine* annotations.

Note that for K8s users this runtime handler will need to be configured by
creating the corresponding RuntimeClass resources on the cluster as it's
not the default runtime.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-19 07:56:43 -07:00
Samuel Karp
f4a905109b
Merge pull request #7308 from dcantah/rm-mingw-downgrade 2022-08-18 22:49:06 -07:00
Kazuyoshi Kato
f318947b06 Do not rename test files on-the-fly to share functions
Instead this commit moves some functions that could be used by fuzzers.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-19 03:48:18 +00:00
Daniel Canter
912d43b2bd Revert "Downgrade MinGW to version 10.2.0"
This reverts commit 1ef4bda433.

Previously we were downgrading mingw to work around an issue in the race
detector in Go on Windows when used with a newer version of GCC. The
issue was first reported here:

golang/go#46099

Shortly after the release of 1.19 someone had commented this issue was
solved for them, and after trying it out in some test runs on actions
machines, it seems to be the case. Disabling ASLR got things in order, and
PIE was disabled for -race builds in 1.19, so this is likely the reason
things work now:
0c7fcf6bd1.

The downgrade was mostly harmless except for two shortcomings:

1. It took quite a while for the package to get downloaded+installed.

2. Chocolatey would frequently fail to download with `The remote file
either doesn't exist, is unauthorized, or is forbidden for url ...
Exception calling "GetResponse" with "0" argument(s): "The request
was aborted: Could not create SSL/TLS secure channel."` Restarting the
failed run would often resolve this, but a 50-50 shot of things working
is not a great situation.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-18 15:18:49 -07:00
Phil Estes
49a945b26b
Merge pull request #7286 from fuweid/follow-up-7254
Follow up #7254 (Switch to Go 1.19)
2022-08-18 10:35:43 -04:00
Phil Estes
4e37eb3329
Merge pull request #7304 from kzys/upgrade-cgroups
Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
2022-08-18 10:31:34 -04:00
Fu Wei
7c43483601
Merge pull request #7301 from henry118/bpfcap
Adding support of CAP_BPF and CAP_PERFMON
2022-08-18 18:36:38 +08:00
Wei Fu
850f667f57 contrib/fuzz/daemon.go: reformat the fileheader
Align with
https://github.com/containerd/project/blob/main/script/validate/template/go.txt.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-18 07:42:13 +08:00
Wei Fu
460b0533b2 pkg/cri/streaming: increase ReadHeaderTimeout
It is follow-up of #7254. This commit will increase ReadHeaderTimeout
from 3s to 30m, which prevent from unexpected timeout when the node is
running with high-load. 30 Minutes is longer enough to get close to
before what #7254 changes.

And ideally, we should allow user to configure the streaming server if
the users want this feature.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-18 07:42:12 +08:00
Kazuyoshi Kato
9d286baedf crypto/sha256 must be imported
Otherwise, go-digest panics (panic: sha256 not available).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:47 +00:00
Kazuyoshi Kato
adc7d5b2e9 Don't patch github.com/cilium/ebpf
The package doesn't have the file anymore.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:47 +00:00
Kazuyoshi Kato
470d3ee057 Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
The fuzzer is broken and it breaks OSS-Fuzz according to #7288.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:45 +00:00
Kevin Parsons
f0e1a27cbd
Merge pull request #7284 from dcantah/hcsshim-bump-0.10
go.mod: Bump hcsshim to v0.10.0-rc.1
2022-08-17 13:12:42 -07:00
Henry Wang
43907515b4 adding support of CAP_BPF and CAP_PERFMON
Signed-off-by: Henry Wang <henwang@amazon.com>
2022-08-17 19:59:09 +00:00
Samuel Karp
0fd000f59c
Merge pull request #7306 from chaodaiG/fix-bash-bug 2022-08-17 12:00:33 -07:00
Chao Dai
13b14736a8 Don't fail test when GOOGLE_APPLICATION_CREDENTIALS is unset
Workload identity is preferred in CI instead of GOOGLE_APPLICATION_CREDENTIALS

Signed-off-by: Chao Dai <chaodai@google.com>
2022-08-17 11:51:38 -07:00
Daniel Canter
0950447106 Remove Windows special case in TestContainerdRestart
Previously in the Windows shim, killing a task that has already exited
or a task that has not yet been started, yielded an ErrNotFound. We now
return nil, which is in line with how the linux runtime behaves, so remove
the special case we had in TestContainerdRestart for this.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-15 17:03:45 -07:00
Daniel Canter
1f8db2467b go.mod: Bump hcsshim to v0.10.0-rc.1
This contains quite a bit (also bumps google/uuid to 1.3.0). Some HostProcess
container improvements to get ready for whenever it goes to stable in
Kubernetes, Hyper-V (windows) container support for CRI, and a plethora of
other small additions and fixes.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-15 17:03:45 -07:00
Samuel Karp
a04268132e
Merge pull request #7293 from samuelkarp/ci-workflow-goproxy 2022-08-15 16:50:18 -07:00
Samuel Karp
396d2a7e4e
ci: remove GOPROXY environment variable due to https://github.com/go-yaml/yaml/issues/887
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-15 13:00:49 -07:00
Fu Wei
6699403403
Merge pull request #7280 from mxpv/runtime
Runtime cleanup (Shim manager and task service)
2022-08-13 17:20:16 +08:00
Maksym Pavlenko
1d8b1bc75b Cleanup shim manager
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-11 21:41:32 -07:00
Samuel Karp
f87a1b09fe
Merge pull request #6931 from egernst/cri-stress 2022-08-10 17:59:48 -07:00
Maksym Pavlenko
ff65fc2d0e Make TaskList generic
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-10 14:02:53 -07:00
Maksym Pavlenko
23f66ece59
Merge pull request #7254 from mxpv/go
Switch to Go 1.19
2022-08-10 12:12:49 -07:00
ruiwen-zhao
6e4b6830f1 Update CRI-API
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-08-10 03:55:51 +00:00
Akihiro Suda
4902059cb5
Merge pull request #7265 from fuweid/dump-containerd-log-after-finish
Vagrantfile: dump containerd log after critest
2022-08-07 22:45:21 +09:00
Wei Fu
782fd3c8e6 Vagrantfile: dump containerd log after critest
It is used to debug if there is any flaky test cases.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-07 12:36:17 +08:00
Fu Wei
6deb1174fb
Merge pull request #7257 from junnplus/group-id
oci: skip checking group id for WithAppendAdditionalGroups
2022-08-07 12:15:20 +08:00
Maksym Pavlenko
74c09b7569 Fix contrib/ header
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-06 10:27:40 -07:00
Maksym Pavlenko
8add7e5d39 Rework permission handling in scripts
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-05 17:05:36 -07:00
Derek McGowan
de68174ec3
Merge pull request #7259 from samuelkarp/release-workflow
release workflow: increase timeout to 30 minutes & remove Go setup action
2022-08-05 16:57:07 -07:00
Samuel Karp
d7c952a053
Merge pull request #7258 from AkihiroSuda/fix-7255 2022-08-05 15:02:18 -07:00
Samuel Karp
6ba91de840
release workflow: remove Go setup action
Release builds are performed from within a Dockerfile-defined
environment and do not require Go to be installed in the GitHub Actions
runner environment.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-05 10:09:30 -07:00
Samuel Karp
f8add9263a
release workflow: increase timeout to 30 minutes
In the 1.6.7 release, we saw significantly longer execution time for
producing builds that exceeded the previous timeout of 10 minutes,
causing the workflow to fail.  After increasing to 20 minutes in the
release/1.6 branch, we continued to see one failure (which succeeded on
retry).

Increase to 30 minutes to provide additional buffer for the build to
complete.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-05 10:08:04 -07:00
Ye Sijun
2dbff1dbca
oci: skip checking gid for WithAppendAdditionalGroups
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-08-06 00:57:19 +08:00
Akihiro Suda
4818610207
release: rollback Ubuntu to 18.04 (except for riscv64)
Partially revert 0e56e4f9ff

Rollback the build environment from Ubuntu 22.04 to 18.04, except for riscv64 that isn't supported by Ubuntu 18.04.

Fix issue 7255 (`1.6.7 can't be run on Ubuntu LTS 20.04 (GLIBC_2.34 not found)`)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-08-06 01:00:49 +09:00
Maksym Pavlenko
68bae258a3 Update protobuf definitions
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 19:28:58 -07:00
Maksym Pavlenko
ca3b9b50fe Run gofmt 1.19
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:18:33 -07:00
Maksym Pavlenko
4a11a40189 Update golangci-lint to 1.48 with Go 1.19 support
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:16:17 -07:00
Maksym Pavlenko
ea66130295 Switch to Go 1.19
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:05:44 -07:00
Maksym Pavlenko
01a2b793b8
Merge pull request #7228 from mxpv/sb2
Initial sandbox API CRI integration.
2022-08-04 17:46:38 -07:00
Fu Wei
182b6995c0
Merge pull request #7251 from mxpv/env 2022-08-05 08:26:35 +08:00