github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,337 Commits 3 Branches 2 Tags 112 MiB
b16d467404
Commit Graph

401 Commits

Author SHA1 Message Date
Phil Estes
d9d74c14b4
Merge pull request #8013 from profnandaa/patch-2 
fix(docs): minor fix on the windows installation steps
 2023-01-31 17:03:35 -05:00
Anthony Nandaa
27cf7f87db
fix(docs): minor fix on the windows installation steps 
`*` was left out and therefore the `/bin` directory is also copied over, while the following commands assume the files are copied to `containerd`

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
 2023-01-27 09:54:04 +03:00
Edgar Lee
34d5878185 Use mount.Target to specify subdirectory of rootfs mount 
- Add Target to mount.Mount.
- Add UnmountMounts to unmount a list of mounts in reverse order.
- Add UnmountRecursive to unmount deepest mount first for a given target, using
moby/sys/mountinfo.

Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
 2023-01-27 09:51:58 +08:00
Derek McGowan
70eada1fa3
Merge pull request #7925 from Iceber/content-flow 
docs/content-flow: update the description of the content labels
 2023-01-05 12:58:03 -08:00
Iceber Gu
f9a702105d docs/content-flow: update the description of the content labels 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-01-05 14:03:31 +08:00
Iceber Gu
fc905324a6 docs/content-flow: update the digests of the redis:5.0.9 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2023-01-05 14:03:20 +08:00
Changwei Ge
88c8d2e39c docs: fix a typo in tracing documentation 
It should be "daemon"

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
 2023-01-04 10:27:36 +08:00
Fu Wei
021beb59e4
Merge pull request #7747 from yanggangtony/fix-ops-md 2022-12-04 00:01:00 +08:00
Krisztian Litkey
740e90177a go.mod: re-vendor NRI from the official repo. 
Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2022-12-02 19:07:30 +02:00
yanggang
3453321756
upgrade the ops.md output for current 1.7 version . 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-12-02 17:19:34 +08:00
Derek McGowan
f88162587b
Rename transferer to transferrer 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 16:02:09 -08:00
Derek McGowan
f1598cf5e8
Update transfer docs 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:58 -08:00
Derek McGowan
b0f519703d
Add transfer docs 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-11-30 12:56:54 -08:00
Krisztian Litkey
a0daf1c288 docs: add NRI-related documentation. 
Co-authored-by: Mike Brown <brownwm@us.ibm.com>
Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2022-11-28 21:51:56 +02:00
Aman Sharma
69af001b3a Replace broken and redirection link for CRI and kubelet in docs 
Signed-off-by: Aman Sharma <amansh@vmware.com>
 2022-11-15 09:57:42 +05:30
Swagat Bora
7def13dde3 Add a thin wrapper around otel Span object 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2022-11-11 01:28:27 +00:00
Kazuyoshi Kato
e306680f44
Merge pull request #7607 from jess-sol/main 
Support default hosts.toml configuration
 2022-11-04 10:22:00 -07:00
Jess
8b1b81eefd Update hosts doc 
Signed-off-by: Jess <jess@ros.io>
 2022-11-03 16:26:59 -06:00
Swagat Bora
3b87d46ce2 Add tracing spans in CRI image service and pull.go 
Signed-off-by: Swagat Bora <sbora@amazon.com>

Add spans around image unpack operations
Use image.ref to denote image name and image.id for the image config digest
Add top-level spand and record errors in the CRI instrumentation service
 2022-11-03 17:03:43 +00:00
Maksym Pavlenko
bb45abaa2c
Merge pull request #7463 from KyleFrisbie/patch-1 
use raw link to containerd.service config
 2022-10-04 09:21:58 -07:00
Gabriela Cervantes
f330ffd832 cri doc: Update kata containers reference 
This PR updates the url for the kata containers reference about
how to use kata containers and containerd for untrusted workloads.

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
 2022-10-03 16:16:34 +00:00
Kyle L Frisbie
0119d43a41
use raw link to containerd.servic config 
Referencing the raw link to the containerd.service may enhance the developer experience by enabling those following the docs to use the raw link directly to `wget` or `curl` the file without additional navigation.

Signed-off-by: Kyle L Frisbie <KyleFrisbie@users.noreply.github.com>
 2022-10-02 14:36:59 -06:00
Ed Bartosh
e22a7a3833 reference CDI configuration details 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2022-09-21 11:25:28 +03: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
Oliver Radwell
d8d63a7aa3
docs: Fix sample config.toml syntax 
Signed-off-by: Oliver Radwell <oliver.radwell@gmail.com>
 2022-07-16 21:56:07 +01:00
Ed Bartosh
c733119db7 cri doc: fix formatting for CDI options 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2022-07-13 12:38:58 +03:00
Gavin Inglis
174b013446 update some devmapper docs 
Updated some documentation for devmapper snapshotter plugin.
Made consistent use of "thin-pool", "Device Mapper" when referring to
the volume management framework, and "devmapper" when referring to the
snapshotter plugin itself.

Also added some additional resources / reorg.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
 2022-07-11 15:49:54 +00:00
Derek McGowan
281c2b8f90
Merge pull request #7103 from 2000yeshu/fix-doc 
Fix Documentation Issue
 2022-06-27 10:58:12 -07:00
Yakul Garg
47ad5f70e7 Fix Doc: 
since containerd doesn't have GenerateSpec method any longer, spec has to be generated with WithNewSpec.

Signed-off-by: Yakul Garg <2000yeshu@gmail.com>
 2022-06-25 12:09:30 +05:30
Ye Sijun
4f0ea7831b
fix: missing sudo for devmapper doc 
Signed-off-by: Ye Sijun <junnplus@gmail.com>
 2022-06-22 22:56:11 +08:00
xin.li
2e288f5b1b improve content-flow 
Signed-off-by: xin.li <xin.li@daocloud.io>
 2022-06-18 14:26:16 +08:00
Phil Estes
2b661b890f
Merge pull request #6899 from shuaichang/ISSUE6657-support-runtime-snapshotter 
Support runtime level snapshotter for issue 6657
 2022-06-03 10:04:53 +02:00
shuaichang
7b9f1d4058 Added support for runtime level snapshotter, issue 6657 
Signed-off-by: shuaichang <shuai.chang@databricks.com>

Updated annotation name
 2022-06-02 16:29:59 -07:00
Paco Xu
1cf6f20320 promote pause image to 3.7 
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
 2022-05-30 15:08:28 +08:00
Shaun Lawrie
b5107a8984
Fix Windows install powershell script 
Signed-off-by: Shaun Lawrie <beatbophiphop@gmail.com>
 2022-05-21 19:31:17 +12:00
Iceber Gu
b69182c71d add note that a namespace cannot be named "version" 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2022-05-19 22:53:21 +08:00
Gavin Inglis
c721c8e274 devmapper docs: small fixes 
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
 2022-05-06 18:34:06 +00:00
Phil Estes
8ec0909bbe
Merge pull request #6875 from marosset/windows-installation-docs 
docs: Adding windows installation steps to getting-started.md
 2022-04-29 17:20:01 +01:00
Mike Brown
6b35307594
Merge pull request #5490 from askervin/5Bu_blockio 
Support for cgroups blockio
 2022-04-29 10:07:56 -05:00
Antti Kervinen
10576c298e cri: support blockio class in pod and container annotations 
This patch adds support for a container annotation and two separate
pod annotations for controlling the blockio class of containers.

The container annotation can be used by a CRI client:
  "io.kubernetes.cri.blockio-class"

Pod annotations specify the blockio class in the K8s pod spec level:
  "blockio.resources.beta.kubernetes.io/pod"
  (pod-wide default for all containers within)

  "blockio.resources.beta.kubernetes.io/container.<container_name>"
  (container-specific overrides)

Correspondingly, this patch adds support for --blockio-class and
--blockio-config-file to ctr, too.

This implementation follows the resource class annotation pattern
introduced in RDT and merged in commit 893701220.

Signed-off-by: Antti Kervinen <antti.kervinen@intel.com>
 2022-04-29 11:44:09 +03:00
Mark Rossetti
9b04d2fae2 docs: Adding windows installation steps to getting-started.md 
Signed-off-by: Mark Rossetti <marosset@microsoft.com>
 2022-04-28 13:46:17 -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
f033f6ff85
Merge pull request #6778 from AkihiroSuda/docs-cri-simplify 
Add `docs/snapshotters`; simplify `docs/cri`
 2022-04-06 09:23:55 -07:00
Ed Bartosh
c9b4ccf83e add configuration for CDI 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2022-04-06 13:10:54 +03:00
Akihiro Suda
35383fb428
docs/cri: simplify 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-06 13:31:18 +09:00
Akihiro Suda
493baa6e7c
Add docs/snapshots 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-06 13:31:18 +09:00
Derek McGowan
d351162178
Merge pull request #6777 from AkihiroSuda/docs-move-design-historical 
mv design docs/historical/design
 2022-04-05 21:29:52 -07:00
Kazuyoshi Kato
83f44ddab5
Merge pull request #6776 from AkihiroSuda/docs-remove-runtime-v1 
docs: remove runtime v1; migrate config v1 to v2
 2022-04-05 11:13:50 -07:00
Akihiro Suda
44d7cd1528
mv design docs/historical/design 
The docs have been out of the sync with the actual implementation since 2018.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-05 16:50:12 +09:00
Akihiro Suda
195fc74244
docs: migrate config v1 to v2 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-05 16:41:54 +09:00
Akihiro Suda
84cebafe8f
docs: remove deprecated io.containerd.runtime.v1.linux 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-05 16:13:42 +09:00
Akihiro Suda
83665bf8d2
docs/getting-started.md: typo 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-05 15:56:21 +09:00
Akihiro Suda
ccea927d95
Move historical docs to docs/historical 
To clarify that end users do not need to read these docs, and that these
docs do not need to be updated

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-04 17:48:46 +09:00
Akihiro Suda
6f269ccb3c
docs/getting-started.md: massive update 
The previous documentation was too much forcusing on the Go API and not useful
for users who are not interested in implementing their own containerd client.
It was also recommending the deprecated way (cri-containerd-*.tar.gz) to install
containerd and its dependencies.

The new documentation recommends the current official way to install containerd,
and provides several links for end users.

This will replace the content of https://containerd.io/docs/getting-started/
after merging the containerd/containerd.io PR 120.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-01 20:45:17 +09:00
Jordan Karaze
cf571fa968 added make help for cri integration 
Signed-off-by: Jordan Karaze <jordan.karaze@ibm.com>
 2022-03-28 16:44:12 -05:00
Oleg Atamanenko
fdb746442b document log level and format 
Signed-off-by: Oleg Atamanenko <oleg.atamanenko@gmail.com>
 2022-03-15 21:00:58 -07:00
Henry Wang
2e080bf491 Add shared content label to namespaces 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2022-03-11 23:37:02 -08:00
Quan Tian
59b1871b30 Fix link in getting-started.md 
Signed-off-by: Quan Tian <qtian@vmware.com>
 2022-03-11 22:29:44 +08:00
Takumasa Sakao
03a5e648bc Use version 2 config and mention containerd config command 
Signed-off-by: Takumasa Sakao <tsakao@zlab.co.jp>
 2022-03-05 02:22:30 +09:00
Phil Estes
2b68c03a60
Update Go version recommendation in getting started 
Signed-off-by: Phil Estes <estesp@amazon.com>
 2022-02-23 15:48:19 -05: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
Dat Nguyen
afe39bebfe add oci.WithAllDevicesAllowed flag for privileged_without_host_devices 
This commit adds a flag that enable all devices whitelisting when
privileged_without_host_devices is already enabled.

Fixes #5679

Signed-off-by: Dat Nguyen <dnguyen7@atlassian.com>
 2021-11-04 10:24:19 +11: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