Commit Graph

12660 Commits

Author SHA1 Message Date
Kazuyoshi Kato
8a6c8a96c0
Merge pull request #8626 from jsturtevant/fix-windows-podstats-for-hpc
Fix issue for HPC pod metrics
2023-06-01 19:25:08 -07:00
Derek McGowan
023128bd35
Merge pull request #8627 from davidhsingyuchen/cherry-pick-no-merge 2023-06-01 18:08:25 -07:00
Hsing-Yu (David) Chen
a85b12d4d0 docs: cherry-pick individual commits instead of merge commit
Signed-off-by: Hsing-Yu (David) Chen <davidhsingyuchen@gmail.com>
2023-06-01 17:05:06 -07:00
James Sturtevant
738c4c6fa5
Fix issue for HPC pod metrics
The initial PR had a check for nil metrics but after some refactoring in the PR the test case that was suppose cover HPC was missing a scenario where the metric was not nil but didn't contain any metrics. This fixes that case and adds a testcase to cover it.

Signed-off-by: James Sturtevant <jstur@microsoft.com>
2023-06-01 15:12:36 -07:00
Phil Estes
139146ade8
Merge pull request #8619 from thaJeztah/fix_deprecation_comments
remotes/docker: ResolverOptions: fix deprecation comments
2023-06-01 12:42:17 -04:00
Sebastiaan van Stijn
52997ea983
remotes/docker: ResolverOptions: fix deprecation comments
Go deprecation comments must be formatted to have an empty comment line before
them. Fix the formatting to make sure linters and editors detect that these
are deprecated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-06-01 09:28:12 +02:00
Fu Wei
83371c4bef
Merge pull request #8535 from cardyok/metrics_enrich_memory_cgroups
bugfix: add nil pointer check for cgroup v1 mem usage
2023-06-01 13:07:17 +08:00
Cardy.Tang
a35ead5b9d bugfix: add nil pointer check for cgroup v1 mem usage
Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
2023-06-01 09:57:39 +08:00
Kazuyoshi Kato
73645b1dfe
Merge pull request #8588 from lengrongfu/feat/cleanup_config_tls
Cleanup DEPRECATED TLS config
2023-05-31 18:50:54 -07:00
Kazuyoshi Kato
45d78fb1f1
Merge pull request #8582 from chschumacher1994/patch-1
fix(docs): minor fix on the windows installation steps
2023-05-31 17:42:53 -07:00
Phil Estes
2da38b1939
Merge pull request #8605 from dmcgowan/events-cleanup-deprecated
Remove events from init context
2023-05-31 16:09:27 -04:00
Kazuyoshi Kato
659a41fd85
Merge pull request #8174 from Iceber/fix_ctr_run
ctr: fix the cleanup of task
2023-05-31 10:01:12 -07:00
Kazuyoshi Kato
9e834e761a
Merge pull request #8334 from davidhsingyuchen/fix-io-cancel
fix: cio.Cancel() should close the pipes
2023-05-31 09:58:36 -07:00
Kazuyoshi Kato
3ad032e9d0
Merge pull request #8606 from adisky/remove-conf-template-deprecation
Remove cni conf_template deprecation
2023-05-31 09:47:21 -07:00
Kazuyoshi Kato
a81f3fb817
Merge pull request #8525 from elezar/ctr-add-cdi-devices
Add support for CDI devices to ctr run command
2023-05-31 09:36:25 -07:00
Derek McGowan
2a60fe5a60
Remove events from init context
Events from the init context have been replaced by the events plugin

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-05-31 09:35:03 -07:00
Kazuyoshi Kato
30354134d4
Merge pull request #8553 from aznashwan/windows-workflow-2019-base-sku
Windows Integration: Switch Azure-based CI to vanilla 2019 image.
2023-05-31 09:29:14 -07:00
Evan Lezar
d3887b2e62 Support CDI devices in ctr --device flag
This change adds support for CDI devices to the ctr --device flag.
If a fully-qualified CDI device name is specified, this is injected
into the OCI specification before creating the container.

Note that the CDI specifications and the devices that they represent
are local and mirror the behaviour of linux devices in the ctr command.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2023-05-31 16:14:01 +02:00
Phil Estes
80eb76332e
Merge pull request #8602 from mxpv/sbevents
Publish sandbox events
2023-05-31 09:14:08 -04:00
Akihiro Suda
65bca439a9
Merge pull request #8599 from lengrongfu/doc/update-auths-code-comment
update auths code comment
2023-05-31 22:13:54 +09:00
Phil Estes
bd7f543869
Merge pull request #8601 from rye-stripe/add-ctr-run-flags
Add cpuset flags to 'ctr run'
2023-05-31 09:11:26 -04:00
Aditi Sharma
3ca5b4437e Remove cni conf_template deprecation
As discussed in the issue
https://github.com/containerd/containerd/issues/8596
It is a helpful feature at many places and no replacement
readily available

Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
2023-05-31 17:34:33 +05:30
Samuel Karp
8454b23ead
Merge pull request #8597 from thaJeztah/unpack_nits
Image: fix some minor nits
2023-05-31 02:06:48 -07:00
Sebastiaan van Stijn
94f0af3ece
Image.IsUnpacked(): make error-handling more iodiomatic
Check for "err != nil" instead of "err == nil".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-31 09:47:48 +02:00
Sebastiaan van Stijn
54658a1152
Image: rename variable that shadowed import
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-31 09:47:27 +02:00
rongfu.leng
d2b7a1e293 cleanup DEPRECATED TLS config
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
2023-05-31 09:37:41 +08:00
Samuel Karp
8b66a752c9
Merge pull request #7376 from tianon/oci-platform 2023-05-30 18:14:31 -07:00
Maksym Pavlenko
f857626d64 Move PLEG event back to CRI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-30 16:40:58 -07:00
Maksym Pavlenko
fc50334ca9 Generate sandbox exit events from CRI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-30 16:40:58 -07:00
Derek McGowan
c7b9a95bdc
Merge pull request #8603 from cji/cji-mount
Add handling of a '.' commondir and bounds checking to mount_linux
2023-05-30 16:27:54 -07:00
Craig Ingram
d2605de734 add handling of a '.' commondir and bounds checking to mount_linux
Signed-off-by: Craig Ingram <Cjingram@google.com>
2023-05-30 21:13:16 +00:00
Maksym Pavlenko
cf56054594 Move pod sandbox recovery to podsandbox/ package
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-30 13:54:35 -07:00
Maksym Pavlenko
45dbb4e542 Publish sandbox events
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-30 13:54:35 -07:00
Maksym Pavlenko
65906335bf Add sandbox events protos
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-05-30 13:54:35 -07:00
Tianon Gravi
21b3318ebe Fix several conversions of "ocispec.Image" to "ocispec.Platform"
Several bits of code unmarshal image config JSON into an `ocispec.Image`, and then immediately create an `ocispec.Platform` out of it, but then discard the original image *and* miss several potential platform fields (most notably, `variant`).

Because `ocispec.Platform` is a strict subset of `ocispec.Image`, most of these can be updated to simply unmarshal the image config directly to `ocispec.Platform` instead, which allows these additional fields to be picked up appropriately.

We can use `tianon/raspbian` as a concrete reproducer to demonstrate.

Before:

```console
$ ctr content fetch docker.io/tianon/raspbian:bullseye-slim
...

$ ctr image ls
REF                                     TYPE                                                 DIGEST                                                                  SIZE     PLATFORMS    LABELS
docker.io/tianon/raspbian:bullseye-slim application/vnd.docker.distribution.manifest.v2+json sha256:66e96f8af40691b335acc54e5f69711584ef7f926597b339e7d12ab90cc394ce 28.6 MiB linux/arm/v7 -
```

(Note that the `PLATFORMS` column lists `linux/arm/v7` -- the image itself is actually `linux/arm/v6`, but one of these bits of code leads to only `linux/arm` being extracted from the image config, which `platforms.Normalize` then updates to an explicit `v7`.)

After:

```console
$ ctr image ls
REF                                     TYPE                                                 DIGEST                                                                  SIZE     PLATFORMS    LABELS
docker.io/tianon/raspbian:bullseye-slim application/vnd.docker.distribution.manifest.v2+json sha256:66e96f8af40691b335acc54e5f69711584ef7f926597b339e7d12ab90cc394ce 28.6 MiB linux/arm/v6 -
```

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-30 13:13:02 -07:00
Derek McGowan
6d7060099b
Merge pull request #8552 from dcantah/cross-plat-stats
CRI: Make stats respect sandbox's platform
2023-05-30 09:58:50 -07:00
Derek McGowan
197b27bd02
Merge pull request #8586 from mcdonagj/fix-spelling-of-repository-in-nri-docs
Fix: Correct the spelling of repository within the NRI plugin documentation.
2023-05-30 09:27:44 -07:00
Peteris Rudzusiks
f2bc737825 Add cpuset-mems flag to 'ctr run' command
This flag allows cpuset.mems to be specified when running a container. If
provided, the container will use only the defined memory nodes.

Signed-off-by: Peteris Rudzusiks <rye@stripe.com>
2023-05-30 17:56:18 +02:00
Peteris Rudzusiks
f642c0a5f5 ctr: add cpuset-cpus flag to 'ctr run' command
This flag allows cpuset.cpus to be specified when starting a container. If
provided, the container will use only the defined CPU cores.

Signed-off-by: Peteris Rudzusiks <rye@stripe.com>
2023-05-30 17:50:33 +02:00
Derek McGowan
f49789fd54
Merge pull request #8594 from fuweid/fix-blockfile-mount
snapshots/blockfile: use loop if options is empty
2023-05-30 08:33:09 -07:00
Derek McGowan
8e90799d1c
Merge pull request #8595 from cardyok/scratch_generator_use_dst
snapshots/blockfile: use passed in dst in scratchGenerator
2023-05-30 08:32:27 -07:00
rongfu.leng
314d758fa1 update auths code comment
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
2023-05-30 23:05:48 +08:00
Cardy.Tang
9702d4aeec snapshots/blockfile: use passed in dst in scratchGenerator
Signed-off-by: Cardy.Tang <zuniorone@gmail.com>
2023-05-30 11:42:19 +08:00
Wei Fu
bb82f3683e snapshots/blockfile: use loop if options is empty
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-05-29 23:26:39 +08:00
Samuel Karp
4b7145cfd3
Merge pull request #8587 from lengrongfu/feat/upgrade_pause_version 2023-05-29 00:55:22 -07:00
rongfu.leng
9287711b7a upgrade registry.k8s.io/pause version
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
2023-05-28 07:59:10 +08:00
Gary McDonald
fbb38ab6b8
Fix the spelling of repository within the NRI plugin documentation.
Signed-off-by: Gary McDonald <mcdonagj@dukes.jmu.edu>
2023-05-27 13:18:46 -04:00
chschumacher1994
752e13d9a9
fix(docs): minor fix on the windows installation steps
If this command is used without "-Container:$false" and the "containerd" directory does not already exist all files will be merged into a single "containerd" file instead of a new directory.

Signed-off-by: chschumacher1994 <115921143+chschumacher1994@users.noreply.github.com>
2023-05-27 01:35:42 +02:00
Samuel Karp
d0dba8e163
Merge pull request #8576 from henry118/ready 2023-05-26 14:41:57 -07:00
Nashwan Azhari
c1b9268007 Windows Integration: Switch Azure-based CI to vanilla 2019 image.
This patch switches the Azure-based Windows workflows to using the
vanilla `2019-Datacenter` Azure SKU following the deprecation of the
old specialized `2019-Datacenter-with-Containers-smalldisk` SKU which
was previously used.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2023-05-26 21:26:05 +03:00