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

1804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
e093a0ee08
Use local "ensureRemoveAll" instead of docker/pkg/system 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-12 20:21:14 +01:00
Sebastiaan van Stijn
46fcfe5219
vendor: docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-10 18:06:27 +01:00
Mike Brown
687469d3ce
Merge pull request #1415 from AkihiroSuda/cgroup2-privileged-no-unshare-cgroupns 
cgroup2: do not unshare cgroup namespace for privileged
 2020-03-09 12:45:50 -05:00
Akihiro Suda
fa72e2f693 cgroup2: do not unshare cgroup namespace for privileged 
Conforms to the latest KEP:
0e409b4749/keps/sig-node/20191118-cgroups-v2.md (cgroup-namespace)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-03-09 01:49:04 +09:00
Mike Brown
1a00c06886
Merge pull request #1413 from thaJeztah/update_kubernetes 
vendor: update kubernetes to v1.18.0-beta.1
 2020-03-06 11:19:56 -06:00
Sebastiaan van Stijn
a3e7f68fa5
vendor: update kubernetes v1.18.0-beta.1 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-06 16:18:37 +01:00
Sebastiaan van Stijn
4210588d3c
vendor: sigs.k8s.io/yaml v1.2.0 
full diff: https://github.com/kubernetes-sigs/yaml/compare/v1.1.0...v1.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-06 16:18:35 +01:00
Sebastiaan van Stijn
ef54a7839a
vendor: bump golang.org/x/crypto bac4c82f6975 (CVE-2020-9283) 
no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-06 16:18:33 +01:00
Sebastiaan van Stijn
b1417519e0
vendor: github.com/google/gofuzz v1.1.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-06 16:18:30 +01:00
Mike Brown
5f0cbd5ffe
Merge pull request #1414 from thaJeztah/update_containerd 
vendor: update containerd 0131015594
 2020-03-06 08:42:39 -06:00
Sebastiaan van Stijn
24cbca5a78
vendor: update containerd 0131015594 
full diff: e1221e69a8...0131015594

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 23:49:40 +01:00
Mike Brown
d68533d654
Merge pull request #1412 from mikebrow/update-golang-1.13.8 
update to golang 1.13.8
 2020-03-05 14:44:40 -06:00
Mike Brown
d5ff8b5781
Merge pull request #1411 from thaJeztah/reformat_vendor 
Reformat vendor.conf: use columns, pin by git-sha, and sort alphabetically
 2020-03-05 14:21:44 -06:00
Mike Brown
ad984ca844 update to golang 1.13.8 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-03-05 13:31:15 -06:00
Sebastiaan van Stijn
3650918d9d
vendor.conf: reformat to use columns 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 19:32:07 +01:00
Sebastiaan van Stijn
1b74251d91
vendor.conf: sort imports alphabetically 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 19:28:26 +01:00
Mike Brown
073e3c9bb4
Merge pull request #1403 from thaJeztah/align_selinux_to_tag 
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
 2020-03-03 13:04:02 -06:00
Sebastiaan van Stijn
bb59a061ef
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf 
full diff: c990c680b6...52ab431487

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-02 18:12:23 +01:00
Mike Brown
6565c640be
Merge pull request #1407 from dims/update-opencontainers/selinux-to-1.3.3 
Update to a released version of opencontainers/selinux (1.3.3)
 2020-02-28 14:56:49 -06:00
Mike Brown
d4d6b3a0fc
Merge pull request #1340 from lumjjb/enc-node-model 
Implement node key model for image encryption
 2020-02-28 10:49:36 -06:00
Davanum Srinivas
3d4c597bdc
Update to a released version of opencontainers/selinux (1.3.3) 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-02-28 11:43:02 -05:00
Brandon Lum
8d5a8355d0 Updated docs and code for default nil behavior 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-27 23:42:03 +00:00
Brandon Lum
808ae59cf6 Update vendors to versioning 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 22:08:31 +00:00
Brandon Lum
7a24da0375 Updated docs and encryption.md -> decryption.md 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
c5209cd679 Updated doc based on changes requested 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
ffcef9dc32 Addressed nits 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
8df431fc31 Defer multitenant key model to image auth discussion 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
c43a7588f6 Refactor encrypted opts and added unit test 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
ac8ec18813 bump imgcrypt commit version 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
f0579c7b4d Implmented node key model for image encryption 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Mike Brown
f4b3cdb892
Merge pull request #1399 from mikebrow/pause-image-update 
move to v3.2 for the pause image
 2020-02-20 10:45:16 -06:00
Akihiro Suda
c23ed3befc
Merge pull request #1402 from thaJeztah/bump_crypto 
vendor: golang.org/x/crypto 1d94cc7ab1c630336ab82ccb9c9cda72a875c382
 2020-02-20 16:43:27 +09:00
Sebastiaan van Stijn
98ce6c022e
vendor: golang.org/x/crypto 1d94cc7ab1c630336ab82ccb9c9cda72a875c382 
full diff: 60c769a6c5...1d94cc7ab1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-02-19 12:44:01 +01:00
Mike Brown
c9ed98462d move to v3.2 for the pause image 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-02-14 12:55:52 -06:00
Mike Brown
cf0e0a1e2c
Merge pull request #1332 from bg-chun/update_cri_for_hugepages 
update cri-plugin to parse hugepages limit
 2020-02-12 10:05:01 -06:00
Mike Brown
c955404ce7
Merge pull request #1384 from jterry75/fix_grpc_err 
Fix store error serialization to gRPC status codes
 2020-02-06 10:22:04 -06:00
Byonggon Chun
c02c24847f update cri-plugin to parse hugepages limit from CRI message 
Signed-off-by: Byonggon Chun <bg.chun@samsung.com>
 2020-02-06 15:28:24 +09:00
Justin Terry (VM)
a8cc66b37a Fix store error serialization to gRPC status codes 
The pkg/store errors are duplicated errors of NotFound and AlreadyExist from
containerd's errdefs package and thus do not properly serialize when running
errdefs.ToGRPC on them. CRI runs this function on every return from a CRI
method so the conversion fails if there is a cache miss from the store caches
for containers or sandboxes. This change verifies that the errors are properly
converted to their gRPC values.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2020-02-05 18:32:45 -08:00
Byonggon Chun
99c6e0dd51 Update Kubernetes dependencies for CRI update 
update cri-api vendor to include hugepages changes
KEP: https://github.com/kubernetes/enhancements/pull/1199
CRI: https://github.com/kubernetes/kubernetes/pull/83614

Signed-off-by: Byonggon Chun <bg.chun@samsung.com>
 2020-02-05 13:37:28 +09:00
Mike Brown
c0294ebfe0
Merge pull request #1387 from thaJeztah/bump_yaml 
vendor: bump gopkg.in/yaml.v2 v2.2.8
 2020-01-29 18:33:17 -06:00
Sebastiaan van Stijn
3d0818d99e
vendor: bump gopkg.in/yaml.v2 v2.2.8 
full diff: https://github.com/go-yaml/yaml/compare/v2.2.4...v2.2.8

includes:

- go-yaml/yaml@f90ceb4f40 Fix check for non-map alias merging in v2
    - fix for "yaml.Unmarshal crashes on "assignment to entry in nil map""
- go-yaml/yaml 543 Port stale simple_keys fix to v2
- go-yaml/yaml@1f64d6156d Fix issue in simple_keys improvements
    - fixes "Invalid simple_keys now cause panics later in decode"
- go-yaml/yaml 555 Optimize cases with long potential simple_keys

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-28 13:42:20 +01:00
Akihiro Suda
19589b4bf9
Merge pull request #1383 from dims/update-to-new-rc10-of-opencontainers/runc 
Bump to opencontainers/runc new version - v1.0.0-rc10
 2020-01-25 05:01:09 +09:00
Davanum Srinivas
5f0bf05239
pick up fix for CVE-2019-19921 in opencontainers/selinux 
opencontainers/selinux/issues/61 has a request for a new release

Here's the full diff:
3a1f366feb...5215b1806f

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-24 13:45:40 -05:00
Davanum Srinivas
311887da35
Bump to opencontainers/runc new version - v1.0.0-rc10 
We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-24 09:56:50 -05:00
Mike Brown
3f99b45073
Merge pull request #1380 from AkihiroSuda/vendor-kube1.17.1 
vendor kubernetes 1.17.1
 2020-01-23 13:20:52 -08:00
Akihiro Suda
2d28b60046 vendor kubernetes 1.17.1 
Corresponds to https://github.com/kubernetes/kubernetes/blob/v1.17.1/go.mod

note: `k8snet.ChooseBindAddress()` was renamed to `k8snet.ResolveBindAddress()` in afa0b808f8

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-22 02:06:50 +09:00
Akihiro Suda
5e5960f2bc
Merge pull request #1376 from Zyqsempai/add-cgroups-v2-metrics 
Cgroupv2: Added CPU, Memory metrics
 2020-01-21 23:21:09 +09:00
Boris Popovschi
6b8846cdf8 vendor updated + added cgroupv2 metrics 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2020-01-17 11:55:06 +02:00
Lantao Liu
b2804c0693
Merge pull request #1371 from AkihiroSuda/cgroup2-unshare-cgroupns 
cgroup2: unshare cgroup namespace for containers
 2020-01-14 10:08:14 -08:00
Akihiro Suda
982e767745
Merge pull request #1374 from lumjjb/bump_containerd 
Bump vendor containerd/containerd version
 2020-01-11 07:28:33 +09:00