dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-06 21:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,108 Commits 31 Branches 333 Tags
a5f3ebb6dcafe27263615f15b701b56350b3448c
Commit Graph
297 Commits
Author SHA1 Message Date
Wei Fu 85bed5863f *: update drainExecSyncIO docs and validate the timeout 
We should validate the drainExecSyncIO timeout at the beginning and
raise the error for any invalid input.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 791f137a5b)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2024-02-16 12:23:46 +08:00
Sebastiaan van Stijn 5b51b79e2c [release/1.6] fix remaining "v1 config" plugin IDs 
These are no longer included on the main branch, so were not
part of other cherry-picks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-14 12:02:49 +02:00
Oliver Radwell b7cf26d8dc docs: Fix sample config.toml syntax 
Signed-off-by: Oliver Radwell <oliver.radwell@gmail.com>
(cherry picked from commit d8d63a7aa3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-14 12:02:49 +02:00
Akihiro Suda fcdaf09664 docs: migrate config v1 to v2 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 195fc74244)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-14 11:53:43 +02:00
Takumasa Sakao 728d5c5f0b Use version 2 config and mention containerd config command 
Signed-off-by: Takumasa Sakao <tsakao@zlab.co.jp>
(cherry picked from commit 03a5e648bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-14 11:51:00 +02:00
Jess 87acecd040 Update hosts doc 
Signed-off-by: Jess <jess@ros.io>
(cherry picked from commit 8b1b81eefd)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-02-07 23:13:29 +00:00
Paco Xu b66eb726a5 migrate from k8s.gcr.io to registry.k8s.io 
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
(cherry picked from commit 9525b3148a)
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
 2022-10-18 07:47:49 +00:00
Shuntaro Azuma 7321032716 Change the context to avoid misunderstandings 
Signed-off-by: Shuntaro Azuma <azush@amazon.com>
 2022-02-10 11:06:25 +09:00
Kazuyoshi Kato cc59ae4d98 tracing: return (ctx, span) from StartSpan 
OpenTelemetry's Tracer#Start() returns (ctx, span). We have no reasons
to swap them.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-01-29 00:41:21 +00:00
Kazuyoshi Kato e751f1f44f tracing: support OTLP/HTTP in addition to gRPC 
This change adds OTLP/HTTP, specifically http/protobuf support.

http/protobuf is recommended in
https://github.com/open-telemetry/opentelemetry-specification/blob/v1.8.0/specification/protocol/exporter.md.

However kube-apiserver and CRI-O use gRPC, kubelet may support
gRPC in future. So we should support gRPC as well.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-01-29 00:41:18 +00:00
Cody Roseborough 8dd36423b6 Revert "Add shared content label to namespaces" 
This reverts commit e692a01926.

Signed-off-by: Cody Roseborough <cdr@amazon.com>
 2022-01-12 16:38:06 -08:00
Jan Klippel 4f0f363504 corrected link in cri architecture documentation 
The referenced document was moved into the staging directory within the kubernetes repository

Signed-off-by: Jan Klippel <g1thub@kl1pp3l.de>
 2022-01-07 14:58:37 +01:00
Markus Lehtonen 9c2e3835fa cri: add ignore_rdt_not_enabled_errors config option 
Enabling this option effectively causes RDT class of a container to be a
soft requirement. If RDT support has not been enabled the RDT class
setting will not have any effect.

Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2022-01-04 09:27:54 +02:00
Markus Lehtonen eae14688c6 tasks: add Linux rdt support 
Add support for configuring the Linux resctrl pseudo-filesystem with
goresctrl library. The functionality is integrated in the
"io.containerd.service.v1.tasks-service" plugin.

Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2022-01-04 09:27:54 +02:00
Derek McGowan 07aa42f427 Merge pull request #6207 from marquiz/devel/docs 
docs: improve plugin documentation
 2022-01-03 13:20:29 -08:00
Takumasa Sakao 2b28dd363b Fix wrong make target on documentation 
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
 2021-11-23 03:42:08 +09:00
Olli Janatuinen 2a81c9f677 CRI: Support enable_unprivileged_icmp and enable_unprivileged_ports options 
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
 2021-11-15 18:30:09 +02:00
Markus Lehtonen 3196e65f50 docs: document the runtime shim plugin config options 
Add documentation for config options under
[plugins."io.containerd.runtime-shim.v2.shim"].

Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2021-11-04 18:52:18 +02:00
Markus Lehtonen 0d8e07681f docs: use proper markdown lists in containerd-config.toml.5.md 
Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
 2021-11-04 18:45:41 +02:00
Phil Estes dc869b7855 Merge pull request #6125 from xens/update_doc_to_v2 
Update doc to version 2 syntax
 2021-10-28 10:20:17 -04:00
Romain Aviolat ebc5cf19ac feat(doc): update to version 2 syntax 
Signed-off-by: Romain Aviolat <r.aviolat@gmail.com>
 2021-10-21 19:06:47 +02:00
Romain Aviolat 3b73922fba feat(doc): add Core Scheduling documentation 
Adding documentation for the Core Scheduling feature.

Signed-off-by: Romain Aviolat <r.aviolat@gmail.com>
 2021-10-18 19:16:25 +02:00
Michael Crosby 55893b9be7 Add CNI conf based on runtime class 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2021-09-17 19:05:06 +00:00
Michael Crosby 1efed43090 add ip_pref CNI options for primary pod ip 
This fixes the TODO of this function and also expands on how the primary pod ip
is selected. This change allows the operator to prefer ipv4, ipv6, or retain the
ordering provided by the return results of the CNI plugins.

This makes it much more flexible for ops to configure containerd and how IPs are
set on the pod.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2021-09-10 10:04:21 -04:00
kerthcet 820bd92690 fix document non-synchronous in crictl.md 
Signed-off-by: kerthcet <kerthcet@gmail.com>
 2021-09-06 17:47:46 +08:00
Adelina Tuvenie 6d3d34b85d Update Pause image in tests & config 
With the introduction of Windows Server 2022, some images have been updated
to support WS2022 in their manifest list. This commit updates the test images
accordingly.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
 2021-08-31 19:42:57 +03:00
Sebastiaan van Stijn 9cc179aa77 BUILDING.md: remove some bits about building runc 
Refer users to runc's documentation instead of duplicating
the instructions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-10 09:31:02 +02:00
Cody Roseborough e692a01926 Add shared content label to namespaces 
Adds shared content labels to namespaces allowing content to be shared
between namespaces if that namespace is specifically tagged as being
sharable by adding the `containerd.io/namespace/sharable` label to the
namespace.

Signed-off-by: Cody Roseborough <cdr@amazon.com>
 2021-07-28 18:49:32 +00:00
Mike Brown b5fc7846c4 adding a little more clarity 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-07-26 14:55:44 -05:00
Derek McGowan a7ad6b3be5 Add support for registry host path override 
Adds support for mirrors which are non-compliant with the
OCI distribution specification but have previously mirrored
content with a namespace prefix after the API root `/v2`.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-07-02 09:48:27 -07:00
Derek McGowan 95c708572f Update documenation for OCI distribution 1.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-07-01 17:24:08 -07:00
Mike Brown 560e7d4799 fixing some doc links 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-06-21 18:24:47 -05:00
Zufar Dhiyaulhaq 75b4c83f04 fix deprecation config for default runtime 
Signed-off-by: Zufar Dhiyaulhaq <zufardhiyaulhaq@gmail.com>
 2021-06-20 10:09:09 -04:00
Mike Brown 7a2b04758b adds explanation for seccomp unset/unconfined default vs runtime default 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-06-07 17:57:18 -05:00
Kazuyoshi Kato 75daf45beb docs: explicitly mention containerd's Prometheus path 
It is under `/v1/metrics`, which should be explicitly called out.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-06-01 11:15:06 -07:00
Iceber Gu 93d4541a20 docs/cri: update ocicrypt link 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-05-31 15:32:30 +08:00
Iceber Gu 7924664951 docs/cri: fix broken links 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-05-31 15:31:51 +08:00
Gaurav Gahlot a5b1740bbe fixed typos 
Signed-off-by: Gaurav Gahlot <gauravgahlot0107@gmail.com>
 2021-05-19 10:31:50 +05:30
Mike Brown 6e249b1aea adds credentials description 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-05-12 08:37:37 -05:00
Mike Brown b59e29773c adds description for hosts.toml 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-05-02 00:46:41 +00:00
Akihiro Suda 41fc516a22 docs/rootless.md: recommend "easy way" over "hard way" 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-04-14 16:57:46 +09:00
maoyangLiu abd4be07ac fix the 404 url 
Signed-off-by: maoyangLiu <liumaoyang@inspur.com>
 2021-04-13 20:55:26 +08:00
Mike Brown e96d2a5d90 Revert "remove two very old no longer used runtime options" 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-12 10:16:01 -05:00
Mike Brown f9bcf4a8a4 add section link 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 12:29:43 -05:00
Mike Brown d4be6aa8fa rm mirror defaults; doc registry deprecations 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 12:29:43 -05:00
Mike Brown 0186a329e9 remove two very old no longer used runtime options 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-06 20:41:09 -05:00
Fu, Wei 80fa9fe32a Merge pull request #5135 from AkihiroSuda/default-config-crypt 
add imgcrypt stream processors to the default config
 2021-03-25 14:31:38 +08:00
Andrei Dobre e4b9b1038b Make CRI registry docs more clear 
Added reference to previous config syntax.

Signed-off-by: Andrei Dobre <andreidobre.web@gmail.com>
 2021-03-23 22:10:06 +02:00
pacoxu ffff688663 upgrade pause image to 3.5 for non-root 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
 2021-03-16 23:20:35 +08:00
Akihiro Suda ecb881e5e6 add imgcrypt stream processors to the default config 
Enable the following config by default:

```toml
version = 2

[plugins."io.containerd.grpc.v1.cri".image_decryption]
  key_model = "node"

[stream_processors]
  [stream_processors."io.containerd.ocicrypt.decoder.v1.tar.gzip"]
    accepts = ["application/vnd.oci.image.layer.v1.tar+gzip+encrypted"]
    returns = "application/vnd.oci.image.layer.v1.tar+gzip"
    path = "ctd-decoder"
    args = ["--decryption-keys-path", "/etc/containerd/ocicrypt/keys"]
    env = ["OCICRYPT_KEYPROVIDER_CONFIG=/etc/containerd/ocicrypt/ocicrypt_keyprovider.conf"]
  [stream_processors."io.containerd.ocicrypt.decoder.v1.tar"]
    accepts = ["application/vnd.oci.image.layer.v1.tar+encrypted"]
    returns = "application/vnd.oci.image.layer.v1.tar"
    path = "ctd-decoder"
    args = ["--decryption-keys-path", "/etc/containerd/ocicrypt/keys"]
    env = ["OCICRYPT_KEYPROVIDER_CONFIG=/etc/containerd/ocicrypt/ocicrypt_keyprovider.conf"]
```

Fix issue 5128

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-15 13:27:16 +09:00