github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,817 Commits
30 Branches
870 Tags
628 MiB
Commit Graph

25 Commits (3e1693bc97c3002e6939b3ceb8ca06f2678a3b05)

Author SHA1 Message Date
Jacob Blain Christen cb25835d84 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:37:37 -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
Brad Davidson 740b654d47 Update containerd to fix AppArmor on SLES 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-29 16:33:33 -08:00
Jacob Blain Christen 47019226bb
containerd: v1.4.3-k3s1 (#2631) 
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-07 10:02:56 -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
Darren Shepherd 124def22ed Update vendor 2020-02-24 16:03:11 -07:00
Erik Wilson 39d146bb90 Upgrade containerd to v1.3.3-k3s1 2020-01-20 16:17:03 -07:00
Erik Wilson 52c8e8d5c5 Containerd patch 3889 2019-12-17 21:13:52 -07:00
Erik Wilson 8bb8e38fe1 Update vendor 2019-10-25 13:12:43 -07:00
Erik Wilson f9888ca3bb
Merge pull request #933 from erikwilson/bump-cri 
Bump containerd, cri, & cri-tools
 2019-10-22 13:53:48 -07:00
Erik Wilson b3bc7e1561 Update vendor 2019-10-22 10:27:11 -07:00
Erik Wilson e22eb82d61 Update vendor 2019-10-18 12:34:27 -07:00
Erik Wilson 72fbfa5cfd Update vendor 2019-10-17 19:54:56 -07:00
Darren Shepherd 661988fb38 Update vendor 2019-09-27 16:54:32 -07:00
Darren Shepherd d246c89254 go mod vendor 2019-09-05 15:16:39 -07:00
Darren Shepherd 8031137b79 Update vendor 2019-08-30 23:08:05 -07:00
Erik Wilson 94cbef85dd Update containerd to v1.2.7-k3s1 2019-07-09 17:29:38 -07:00
Darren Shepherd 2193fe10cd Update vendor 2019-04-08 22:50:54 -07:00
Darren Shepherd 10f48f4f3f Update vendor 2019-03-04 10:04:48 -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