github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,888 Commits 3 Branches 4 Tags
6835a94707c3e9da641a65d31dfc3bed2daf6be8
Commit Graph

278 Commits

Author SHA1 Message Date
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
Brian Goff
b0b6d9aa03 Add support for using a host registry dir in cri 
This will be used instead of the cri registry config in the main config
toml.

---

Also pulls in changes from containerd/cri@d0b4eecbb3

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2021-03-12 22:42:22 +00:00
Sebastiaan van Stijn
79a51cd16a move runc version to a separate file for easier consumption 
This moves the runc version to build to scripts/setup/runc-version,
which makes it easier for packagers to find the default version
to use.

The RUNC_VERSION environment variable can still be used to override
the version, which can be used (e.g.) to test against different versions
in our CI.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-10 14:28:29 +01:00
Sebastiaan van Stijn
8325ba5d36 Separate runc binary version from libcontainer version 
Now that the dependency on runc (libcontaienr) code has been reduced
considerably, it is probbaly ok to cut the version dependency between
libcontainer and the runc binary that is supported.

This patch separates the runc binary version from the version of
libcontainer that is defined in go.mod, and updates the documentation
accordingly.

The RUNC_COMMIT variable in the install-runc script is renamed to
RUNC_VERSION to encourage using tagged versions, and the Dockerfile
in contrib is updated to allow building with a custom version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-10 13:41:12 +01:00
Sebastiaan van Stijn
b89a63a235 Remove references to apparmor and selinux buildtags for runc 
From the runc v1.0.0-rc93 release notes:

> The "selinux" and "apparmor" buildtags have been removed, and now all runc
> builds will have SELinux and AppArmor support enabled. Note that "seccomp"
> is still optional (though we very highly recommend you enable it).

Also adding a note about kmem support.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-10 12:16:54 +01:00
Iceber Gu
f37ae8fc35 move to v3.4.1 for the pause image 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-03-07 15:21:20 +08:00
Mike Brown
4379557924 Merge pull request #5086 from eramos2/revise-docs 
Fixed wording in docs, and broken link
 2021-02-25 15:32:25 -06:00
alexyadon
c61f0ceada Fix broken docs links (#5085) 
* docs: fix broken links

Signed-off-by: Alex Yadon <alex.yadon@ibm.com>

* docs: use relative paths

Signed-off-by: Alex Yadon <alex.yadon@ibm.com>
 2021-02-25 14:09:49 -06:00
Emmanuel Ramos
224efa9dae Fixed wording in docs, and broken link 
Signed-off-by: Emmanuel Ramos <emmanuel.ramos2@ibm.com>
 2021-02-25 13:18:13 -05:00
Lorenz Brun
36d0bc1f2b Allow moving netns directory into StateDir 
Signed-off-by: Lorenz Brun <lorenz@nexantic.com>
 2021-02-10 18:33:14 +01:00
Wei Fu
3299c5560d Merge pull request #4967 from dmcgowan/cleanup-root 
Move documentation and helper directories out of root
 2021-01-24 15:08:19 +08:00
Aditi Sharma
d09bf18862 Clean Up Doc and fix some broken links 
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-01-20 15:45:43 +05:30
Derek McGowan
7dffdfa560 Move documentation and helper directories out of root 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-01-12 12:19:50 -08:00
Shengjing Zhu
91dc69ee43 docs: point cri release tarball to github release page 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2021-01-03 17:50:40 +08:00
Shengjing Zhu
5988bfc1ef docs: Various typo found by codespell 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-12-22 13:22:16 +08:00
Akihiro Suda
7e6e4c466f remove "selinux" build tag 
The build tag was removed in go-selinux v1.8.0: opencontainers/selinux#132

Related: remove "apparmor" build tag: 0a9147f3aa

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-15 20:05:25 +09:00
Kazuyoshi Kato
03cc4cedc5 docs: fix broken links 
This change fixes broken links in docs/.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2020-11-11 10:19:17 -08:00
Kazuyoshi Kato
a05fa4214d Move CRI plugin's docs from docs/ to docs/cri/ 
There are a lot of documents which are specifically talking about
the CRI plugin. These docs should be in docs/cri/.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2020-11-10 11:49:05 -08:00
Mike Brown
1ab8bdc27b refresh cri testing guide after move 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-10-30 18:22:37 -05:00
Mike Brown
b6053fb7c3 change default for disablesnapshotannotations 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-10-29 15:30:13 -05:00