github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,214 Commits 3 Branches 2 Tags 112 MiB
09d78bb6b9
Commit Graph

22 Commits

Author SHA1 Message Date
Mike Brown
8a04bd0521 address recent runtimes config confusion 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-12 15:33:38 -05: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
dd16b006e5 merge in the move to the new options type 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-08 14:09:59 -05:00
Mike Brown
9144ce9677 shows our runc.v2 default options in the containerd default config 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-08 14:09:59 -05:00
Aditi Sharma
4d4117415e Change CRI config runtime options type 
Changing Runtime.Options type to map[string]interface{}
to correctly marshal it from go to JSON.
See issue: https://github.com/kubernetes-sigs/cri-tools/issues/728

Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-04-08 15:11:33 +05:30
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
Maksym Pavlenko
5ada2f74a7 Keep host order as defined in TOML file 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-04-01 09:29:16 -07:00
Maksym Pavlenko
ddd4298a10 Migrate current TOML code to github.com/pelletier/go-toml 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-03-25 13:13:33 -07: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
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
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
Michael Crosby
41e3057cc6
Merge pull request #5025 from jeremyje/win20h2 
Add references to Windows 20H2 test images.
 2021-02-12 11:58:49 -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
Jeremy Edwards
1c81071d39 Add references to Windows 20H2 test images. 
Signed-off-by: Jeremy Edwards <1312331+jeremyje@users.noreply.github.com>
 2021-02-09 16:25:36 +00:00
Lantao Liu
b5bf1fd5d8 Fix deprecated registry auth conversion. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2021-02-03 19:22:26 -08:00
Gaurav Singh
071a185506 cri/config: fix range iterator issue in ValidatePluginConfig 
Go uses the same address variable while iterating in a range,
so use a copy when using its address.

Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 2020-12-04 17:37:09 -05:00
Derek McGowan
b2642458f9
Update make snapshot annotations disabled by default 
This experimental feature should not be enabled by default as
it is not used by any default snapshotters.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-27 21:32:25 -07:00
Maksym Pavlenko
3508ddd3dd Refactor CRI packages 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 14:45:57 -07:00
Derek McGowan
b22b627300
Move cri server packages under pkg/cri 
Organizes the cri related server packages under pkg/cri

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 13:09:37 -07:00