Commit Graph

21 Commits

Author SHA1 Message Date
Jacob Blain Christen
5573fe4beb [backport 1.21] containerd: v1.4.4-k3s2
Pull in backport of containerd/containerd#5017

Addresses #3296

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2021-05-20 11:38:48 -07:00
Jacob Blain Christen
59a39e9a3b
containerd: v1.4.4-k3s1 (#3090)
Addresses k3s-io/k3s#3066 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2021-03-17 14:38:42 -07:00
Jacob Blain Christen
618b0f98bf
registry mirror repository rewrites (#3064)
Support repository regex rewrite rules when fetching image content.

Example configuration:
```yaml
# /etc/rancher/k3s/registries.yaml
mirrors:
  "docker.io":
    endpoint:
    - "https://registry-1.docker.io/v2"
    rewrite:
      "^library/alpine$": "my-org/alpine"
```

This will instruct k3s containerd to fetch content for `alpine` images
from `docker.io/my-org/alpine` instead of the default
`docker.io/library/alpine` locations.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2021-03-15 16:17:27 -07:00
Jacob Blain Christen
2c666af483
cri: pull in updated /dev/shm fix (#2506)
Do not relabel container /dev/shm when it is host /dev/shm.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-11-11 17:08:59 -07:00
Jacob Blain Christen
ce5c8efbcf
cri: bump to updated fork (#2478)
Addresses rancher/k3s#2240

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-11-09 10:19:00 -07:00
Erik Wilson
daa4beb22c
Update go.mod for k8s 1.19 2020-08-28 17:18:31 -07:00
Jacob Blain Christen
371bee82f9 containerd: bump to v1.3.6
Remove $NOTIFY_SOCKET, if present, from env when invoking containerd to
prevent gratuitous notifications sent to systemd.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-07-27 14:41:52 -07:00
Erik Wilson
e0bf7a053a Bump cri to 1.3.0-k3s6 2020-05-04 10:11:48 -07:00
Erik Wilson
b6cb8149c0 Bump cri to 1.3.0-k3s.5 2020-03-20 15:06:53 -07:00
Darren Shepherd
124def22ed Update vendor 2020-02-24 16:03:11 -07:00
Erik Wilson
4e6ed0873f Update vendor for k8s 1.17.0 2019-12-15 23:28:25 -07:00
Erik Wilson
1cef47fb51 Update vendor 2019-10-30 16:41:56 -07:00
Erik Wilson
b3bc7e1561 Update vendor 2019-10-22 10:27:11 -07:00
Darren Shepherd
661988fb38 Update vendor 2019-09-27 16:54:32 -07:00
Darren Shepherd
8031137b79 Update vendor 2019-08-30 23:08:05 -07:00
Erik Wilson
265968293a Update cri & dependencies 2019-07-12 10:17:03 -07:00
Darren Shepherd
6f01e13fc4 Update vendor 2019-04-09 10:35:00 -07:00
Darren Shepherd
2193fe10cd Update vendor 2019-04-08 22:50:54 -07:00
Darren Shepherd
76a191844c Update vendor 2019-02-07 21:45:31 -07:00
Darren Shepherd
804a341a2c Update vendor 2019-02-04 16:47:53 -07:00
Darren Shepherd
fa08d6076c Update vendor 2019-01-11 21:58:27 -07:00