Commit Graph

12181 Commits

Author SHA1 Message Date
Samuel Karp
57c526b000
Merge pull request #8486 from samuelkarp/cri-rlimit-spec-opt-comment 2023-05-07 23:24:12 -07:00
Samuel Karp
52afa34f52
cri: update WithoutDefaultSecuritySettings comment
This pointer to an issue never got updated after the CRI plugin was
absorbed into the main containerd repo as an in-tree plugin.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2023-05-07 15:22:35 -07:00
Maksym Pavlenko
98f48d485d
Merge pull request #8481 from mxpv/logrus
Cleanup logrus imports
2023-05-05 18:21:55 -07:00
Maksym Pavlenko
6f34da5f80 Cleanup logrus imports
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-05 11:54:14 -07:00
Mike Brown
5dda3d8d55
Merge pull request #8389 from tukwila/support_k8_1.27
containerd support k8s v1.27
2023-05-05 10:16:12 -05:00
Phil Estes
6020903f2c
Merge pull request #8474 from mikebrow/cri-tools-1.27
move to CRI-TOOLS v1.27.0
2023-05-04 10:29:49 -04:00
Samuel Karp
f5b10fdea2
Merge pull request #8473 from brandond/fix-cri-stats_main
cri: Fix umarshal metrics
2023-05-04 00:32:24 -07:00
Mike Brown
28d749c9e2 move to CRI-TOOLS v1.27.0
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2023-05-03 18:14:01 -05:00
Mike Brown
747aafc786
Merge pull request #8470 from thaJeztah/update_go1.20.4
update go to go1.20.4, go1.19.9
2023-05-03 17:00:12 -05:00
Brad Davidson
27f56e607f
Fix umarshal metrics for CRI server
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-05-03 20:50:04 +00:00
Phil Estes
b324a4b8e2
Merge pull request #8467 from alexellis/add-openfaas-adopters
Add faasd and actuated into the ADOPTERS file
2023-05-03 15:40:28 -04:00
Sebastiaan van Stijn
b947a6f528
update go to go1.20.4, go1.19.9
go1.20.4 (released 2023-05-02) includes three security fixes to the html/template
package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle,
crypto/tls, net/http, and syscall packages. See the Go 1.20.4 milestone on our
issue tracker for details:

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

release notes: https://go.dev/doc/devel/release#go1.20.4
full diff: https://github.com/golang/go/compare/go1.20.3...go1.20.4

from the announcement:

> These minor releases include 3 security fixes following the security policy:
>
> - html/template: improper sanitization of CSS values
>
>   Angle brackets (`<>`) were not considered dangerous characters when inserted
>   into CSS contexts. Templates containing multiple actions separated by a '/'
>   character could result in unexpectedly closing the CSS context and allowing
>   for injection of unexpected HMTL, if executed with untrusted input.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-24539 and Go issue https://go.dev/issue/59720.
>
> - html/template: improper handling of JavaScript whitespace
>
>   Not all valid JavaScript whitespace characters were considered to be
>   whitespace. Templates containing whitespace characters outside of the character
>   set "\t\n\f\r\u0020\u2028\u2029" in JavaScript contexts that also contain
>   actions may not be properly sanitized during execution.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-24540 and Go issue https://go.dev/issue/59721.
>
> - html/template: improper handling of empty HTML attributes
>
>   Templates containing actions in unquoted HTML attributes (e.g. "attr={{.}}")
>   executed with empty input could result in output that would have unexpected
>   results when parsed due to HTML normalization rules. This may allow injection
>   of arbitrary attributes into tags.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-29400 and Go issue https://go.dev/issue/59722.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-03 20:38:00 +02:00
Phil Estes
bed2bef9ad
Merge pull request #8465 from aznashwan/windows-workflow-critest-path
Windows integration: fix critest binary path in Azure-based workflow.
2023-05-03 07:45:46 -07:00
Alex Ellis (OpenFaaS Ltd)
c54b706c0c Add faasd and actuated into the ADOPTERS file
* faasd is free and open source - and added in alphabetical order
* actuated is a hybrid SaaS service where customers run
containerd and Firecracker on their own hosts, and the control
plane and scheduler are managed - added later in the file
since it's a commercial adopter.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
2023-05-03 15:28:19 +01:00
Phil Estes
be2ca3c860
Merge pull request #8466 from dmcgowan/fix-transfer-default-limiters
[transfer] avoid setting limiters when max is 0
2023-05-03 06:52:29 -07:00
Derek McGowan
d56466cf39
[transfer] avoid setting limiters when max is 0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-02 18:17:34 -07:00
Derek McGowan
a7ceac8b63
Merge pull request #8337 from keloyang/imagePullThroughput
Register imagePullThroughput and count with MiB
2023-05-02 10:30:19 -07:00
Nashwan Azhari
2e53c0ec8d Windows integration: fix critest binary path in Azure-based workflow.
The critest binary build directory has changed following
kubernetes-sigs/cri-tools#1085 to also include the OS and architecture,
so the Azure-based Windows workflows needed to be updated to account for
the new path.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2023-05-02 19:15:56 +03:00
Phil Estes
069d6acbe1
Merge pull request #8461 from dmcgowan/update-cri-registry-docs
Update CRI registry configuration docs
2023-05-01 13:54:29 -07:00
Akihiro Suda
85734b0076
Merge pull request #8460 from dmcgowan/fix-diff-proxy
Fix panic when differ returns empty result
2023-05-01 20:09:35 +09:00
Derek McGowan
9e7f8fe30c
Update CRI registry configuration docs
Remove deprecated sections except for auth configuration.
Add note about auth configuration deprecation.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-04-29 23:54:25 -07:00
Akihiro Suda
0a1e316887
Merge pull request #8452 from thaJeztah/vendor_runc_1.1.7
vendor: github.com/opencontainers/runc v1.1.7
2023-04-30 15:31:45 +09:00
Akihiro Suda
4f9b9d9f69
Merge pull request #8458 from mxpv/mg
Run CI when adding a PR to a merge queue
2023-04-30 15:30:40 +09:00
Derek McGowan
0d975230e1
Fix panic when remote differ returns empty result
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-04-29 22:55:21 -07:00
Maksym Pavlenko
c58a229e50 Run CI when adding to the merge queue
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-04-28 12:35:38 -07:00
Derek McGowan
54732fa9fb
Merge pull request #8449 from thaJeztah/runc_binary_1.1.7
update runc binary to v1.1.7
2023-04-27 08:05:30 -07:00
Sebastiaan van Stijn
0ba0664742
vendor: github.com/opencontainers/runc v1.1.7
release notes: https://github.com/opencontainers/runc/releases/tag/v1.1.7
full diff: https://github.com/opencontainers/runc/compare/v1.1.6...v1.1.7

This is the seventh patch release in the 1.1.z release of runc, and is
the last planned release of the 1.1.z series. It contains a fix for
cgroup device rules with systemd when handling device rules for devices
that don't exist (though for devices whose drivers don't correctly
register themselves in the kernel -- such as the NVIDIA devices -- the
full fix only works with systemd v240+).

- When used with systemd v240+, systemd cgroup drivers no longer skip
  DeviceAllow rules if the device does not exist (a regression introduced
  in runc 1.1.3). This fix also reverts the workaround added in runc 1.1.5,
  removing an extra warning emitted by runc run/start.
- The source code now has a new file, runc.keyring, which contains the keys
  used to sign runc releases.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-04-27 12:00:23 +02:00
Sebastiaan van Stijn
cbd10e41a6
vendor: github.com/opencontainers/runc v1.1.6
release notes: https://github.com/opencontainers/runc/releases/tag/v1.1.6
full diff: opencontainers/runc@v1.1.5...v1.1.6

This is the sixth patch release in the 1.1.z series of runc, which fixes
a series of cgroup-related issues.

Note that this release can no longer be built from sources using Go
1.16. Using a latest maintained Go 1.20.x or Go 1.19.x release is
recommended. Go 1.17 can still be used.

- systemd cgroup v1 and v2 drivers were deliberately ignoring UnitExist error
  from systemd while trying to create a systemd unit, which in some scenarios
  may result in a container not being added to the proper systemd unit and
  cgroup.
- systemd cgroup v2 driver was incorrectly translating cpuset range from spec's
  resources.cpu.cpus to systemd unit property (AllowedCPUs) in case of more
  than 8 CPUs, resulting in the wrong AllowedCPUs setting.
- systemd cgroup v1 driver was prefixing container's cgroup path with the path
  of PID 1 cgroup, resulting in inability to place PID 1 in a non-root cgroup.
- runc run/start may return "permission denied" error when starting a rootless
  container when the file to be executed does not have executable bit set for
  the user, not taking the CAP_DAC_OVERRIDE capability into account. This is
  a regression in runc 1.1.4, as well as in Go 1.20 and 1.20.1
- cgroup v1 drivers are now aware of misc controller.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-04-27 11:59:14 +02:00
Sebastiaan van Stijn
27c0fe3ebe
update runc binary to v1.1.7
release notes: https://github.com/opencontainers/runc/releases/tag/v1.1.7
full diff: https://github.com/opencontainers/runc/compare/v1.1.6...v1.1.7

This is the seventh patch release in the 1.1.z release of runc, and is
the last planned release of the 1.1.z series. It contains a fix for
cgroup device rules with systemd when handling device rules for devices
that don't exist (though for devices whose drivers don't correctly
register themselves in the kernel -- such as the NVIDIA devices -- the
full fix only works with systemd v240+).

- When used with systemd v240+, systemd cgroup drivers no longer skip
  DeviceAllow rules if the device does not exist (a regression introduced
  in runc 1.1.3). This fix also reverts the workaround added in runc 1.1.5,
  removing an extra warning emitted by runc run/start.
- The source code now has a new file, runc.keyring, which contains the keys
  used to sign runc releases.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-04-27 11:52:10 +02:00
Fu Wei
b27301cd08
Merge pull request #8414 from kiashok/deleteCtrFromCtrStore
Remove entry for container from container store on error
2023-04-26 18:24:27 +08:00
Fu Wei
634b123e75
Merge pull request #8448 from dmcgowan/archive-tests-darwin
Update tar tests to run on Darwin
2023-04-26 16:48:28 +08:00
Derek McGowan
4891bba83f
Update tar tests to run on Darwin
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-04-25 23:08:54 -07:00
Kirtana Ashok
d9f3e387c6 Remove entry for container from container store on error
If containerd does not see a container but criservice's
container store does, then we should try to recover from
this error state by removing the container from criservice's
container store as well.

Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
2023-04-25 16:32:22 -07:00
Derek McGowan
7d7aac7dae
Merge pull request #8393 from Iceber/fix_checkpoint_options
runtime/shim: fix the nil checkpoint options
2023-04-24 21:22:39 -07:00
Maksym Pavlenko
4a67fe01b0
Merge pull request #8441 from mxpv/logrus
Move logrus setup code to log package
2023-04-24 22:05:33 +02:00
Maksym Pavlenko
370be0c18f Move logrus setup code to log package
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-04-24 10:14:13 -07:00
Fu Wei
d18f161710
Merge pull request #8437 from kinvolk/rata/userns-stateless-idmap-error-main 2023-04-25 00:52:11 +08:00
Rodrigo Campos
92b93e376a cri: Vendor v0.27.1
As requested by Akihiro Suda here:
	https://github.com/containerd/containerd/pull/8211#discussion_r1171041922

This just bumps the tag name to the k8s final release. There are no
changes other than the tag name, though.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
2023-04-24 16:11:42 +02:00
Samuel Karp
08afb12339
Merge pull request #8430 from fangn2/update-doc-from-master-to-main 2023-04-22 00:03:50 -07:00
Kazuyoshi Kato
93e3a5cde7
Merge pull request #8360 from dmcgowan/fix-flaky-gc-test
Fix flaky gc sheduler test on Windows
2023-04-21 22:15:04 -07:00
Mike Brown
159d3055a5
Merge pull request #8367 from dcantah/sbserver-podsbstatus-enhance
CRI Sbserver: Make PodSandboxStatus friendlier to shim crashes
2023-04-21 17:49:29 -05:00
Tony Fang
8c80ccc7f4 Update external repo links that changed default branch to main
Signed-off-by: Tony Fang <nhfang@amazon.com>
2023-04-21 20:26:48 +00:00
Samuel Karp
8304c556ef
Merge pull request #8328 from akhilerm/update-ci-signal-readme 2023-04-21 07:00:46 -07:00
Samuel Karp
7b18b48079
Merge pull request #8363 from aznashwan/windows-ci-azure-skus 2023-04-21 05:18:18 -07:00
Fu Wei
0de40f4460
Merge pull request #8416 from dmcgowan/fix-transfer-plugin
Update transfer configuration
2023-04-21 10:46:03 +08:00
Phil Estes
ab843a1e2d
Merge pull request #8417 from dmcgowan/add-proxy-platforms
Add platform config to proxy plugins
2023-04-20 19:53:08 +02:00
Fu Wei
fdd1be6734
Merge pull request #8413 from dcantah/sb_ctr_run
ctr: Add sandbox flag to ctr run
2023-04-20 13:25:40 +08:00
Danny Canter
519457e3e0 ctr: Add sandbox flag to ctr run
Add a flag to be able to run a container in a given sandbox.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-04-19 19:40:59 -07:00
Derek McGowan
c786994eae
Update transfer configuration
Export transfer config fields.
Determine differ based on platform or config.
Get snapshotter from metadata store.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-04-19 18:00:23 -07:00
Derek McGowan
800ec305cb
Merge pull request #8272 from DataDog/ethan.lowman/fix-ctr-transfer-pull
Fix image pulling with Transfer service
2023-04-19 17:51:30 -07:00