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

125 Commits

Author SHA1 Message Date
Phil Estes
ff2e58d114 Merge pull request #5131 from perithompson/windows-hostnetwork 
Add Windows HostProcess Support
 2021-08-20 14:29:37 -04:00
Kazuyoshi Kato
4dd5ca70fb script: update golangci-lint from v1.38.0 and v1.36.0 to v1.42.0 
golint has been deprecated and replaced by revive since v1.41.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-19 16:27:16 -07:00
Gunju Kim
1224060f89 Allow expanded DNS configuration 
Signed-off-by: Gunju Kim <gjkim042@gmail.com>
 2021-08-14 06:13:01 +09:00
Peri Thompson
79b369a0bb Added windows hostProcess cni skip 
Signed-off-by: Peri Thompson <perit@vmware.com>
 2021-08-11 22:23:49 +01:00
Michael Crosby
218db0f9af Merge pull request #5835 from dmcgowan/plugin-events-cleanup 
Move plugin context events into separate plugin
 2021-08-07 21:47:11 -04:00
Derek McGowan
0a0621bb47 Move plugin context events into separate plugin 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-08-05 22:59:20 -07:00
Derek McGowan
6f027e38a8 Remove redundant build tags 
Remove build tags which are already implied by the name of the file.
Ensures build tags are used consistently

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-08-05 22:27:46 -07:00
Kazuyoshi Kato
1d3d08026d Support SIGRTMIN+n signals 
systemd uses SIGRTMIN+n signals, but containerd didn't support the signals
since Go's sys/unix doesn't support them.

This change introduces SIGRTMIN+n handling by utilizing moby/sys/signal.

Fixes #5402.

https://www.freedesktop.org/software/systemd/man/systemd.html#Signals

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-07-26 09:36:43 -07:00
Wei Fu
ac75071b49 remove pkg/cri/platforms package 
The package is a duplicate of platforms. No need to maintain
pkg/cri/platforms.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-07-10 10:14:27 +08:00
Brian Goff
0a8802df67 Allow WithServices to use custom implementations 
Before this change, for several of the services that `WithServices`
handles, only the grpc client is supported.
Now, for instance, one can use an `images.Store` directly instead of
only an `imagesapi.StoreSlient`.

Some of the methods have been renamed to satisfy the difference between
using a grpc `<Foo>Client` vs the main interface.

I did not see a good candidate for TaskService so have left that mostly
unchanged.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2021-07-09 23:30:40 +00:00
Phil Estes
cf600abecc Merge pull request #5619 from mikebrow/cri-add-v1-proxy-alpha 
[CRI] move up to CRI v1 and support v1alpha in parallel
 2021-07-09 14:07:24 -04:00
Mike Brown
d1c1051927 use fu wei's suggeted interface pick for marshaling 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-07-07 15:45:45 -05:00
Mike Brown
14962dcbd2 add alpha version 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-07-06 11:40:20 -05:00
Mike Brown
a5c417ac06 move up to CRI v1 and support v1alpha in parallel 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-06-28 09:34:12 -05:00
Dan Williams
dac2543a07 sandbox: send pod UID to CNI plugins as K8S_POD_UID 
CNI plugins that need to wait for network state to converge
may want to cancel waiting when a short lived pod is deleted.
However, there is a race between when kubelet asks the runtime
to create the sandbox for the pod, and when the plugin is able
request the pod object from the apiserver. It may be the case
that the plugin receives the new pod, rather than the pod
the sandbox request was initiated for.

Passing the pod UID to the plugin allows the plugin to check
whether the pod it gets from the apiserver is actually the
pod its sandbox request was started for.

Signed-off-by: Dan Williams <dcbw@redhat.com>
 2021-06-22 22:53:30 -05: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
Kazuyoshi Kato
1bbee573af github.com/golang/protobuf/proto is deprecated 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-06-17 10:28:48 -04:00
Quan Tian
728743eb28 Fix cleanup context of teardownPodNetwork 
Similar to other deferred cleanup operations, teardownPodNetwork should
use a different context as the original context may have expired,
otherwise CNI wouldn't been invoked, leading to leak of network
resources, e.g. IP addresses.

Signed-off-by: Quan Tian <qtian@vmware.com>
 2021-06-04 19:17:05 +08:00
zounengren
498bb36f67 scrub the stale TODO 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2021-06-01 11:22:15 +08:00
Phil Estes
e47400cbd2 Merge pull request #5100 from adisky/skip-tls-localHost 
Skip TLS verification for localhost
 2021-05-12 14:56:53 -04:00
Mike Brown
c1a35232d8 Merge pull request #5446 from Random-Liu/fix-auth-config 
Fix different registry hosts referencing the same auth config.
 2021-05-04 06:21:02 -05:00
Lantao Liu
81402e4758 Fix different registry hosts referencing the same auth config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2021-05-03 17:42:57 -07:00
Aditi Sharma
8014d9fee0 Skip TLS verification for localhost 
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-05-03 10:21:54 +05:30
Thomas Hartland
efcb187429 Add unit tests for PID NamespaceMode_TARGET validation 
Signed-off-by: Thomas Hartland <thomas.george.hartland@cern.ch>
 2021-04-21 19:59:10 +02:00
Thomas Hartland
b48f27df6b Support PID NamespaceMode_TARGET 
This commit adds support for the PID namespace mode TARGET
when generating a container spec.

The container that is created will be sharing its PID namespace
with the target container that was specified by ID in the namespace
options.

Signed-off-by: Thomas Hartland <thomas.george.hartland@cern.ch>
 2021-04-21 17:54:17 +02:00
Phil Estes
4f18131239 Merge pull request #5286 from payall4u/optimize-cri-redirect-logs 
cri: Reduce the cpu usage of  the function redirectLogs in cri
 2021-04-14 21:33:05 -04:00
Sebastiaan van Stijn
864a3322b3 go.mod: github.com/containerd/go-cni v1.0.2 
full diff: https://github.com/containerd/go-cni/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-14 09:09:18 +02:00
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
Fu, Wei
7e3fd8da24 Merge pull request #5298 from jsturtevant/issue-5297 
Support multi-arch images for Windows via ctr
 2021-04-12 13:52:14 +08:00
payall4u
4bc8f692fc optimize cri redirect logs 
Signed-off-by: Zhiyu Li <payall4u@qq.com>
 2021-04-09 11:45:53 +08:00
Fu, Wei
d064140369 Merge pull request #5302 from mikebrow/toml-cri-defaults 
shows our runc.v2 default options
 2021-04-09 11:11:25 +08:00
Sebastiaan van Stijn
9bc8d63c9f cri/server: use containerd/oci instead of libcontainer/devices 
Looks like we had our own copy of the "getDevices" code already, so use
that code (which also matches the code that's used to _generate_ the spec,
so a better match).

Moving the code to a separate file, I also noticed that the _unix and _linux
code was _exactly_ the same (baring some `//nolint:` comments), so also
removing the duplicated code.

With this patch applied, we removed the dependency on the libcontainer/devices
package (leaving only libcontainer/user).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-08 23:25:21 +02: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
88880f0f2c Merge pull request #5304 from mikebrow/cri-registry-doc-updates 
remove mirrors from default; document the deprecation of registry.configs and registry.mirrors
merging based on LGTMs from https://github.com/containerd/containerd/pull/5304#pullrequestreview-628234110 and https://github.com/containerd/containerd/pull/5304#pullrequestreview-630478887 thanks!
 2021-04-07 14:49:36 -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
Akihiro Suda
8ba8533bde pkg/cri/opts.WithoutRunMount -> oci.WithoutRunMount 
Move `pkg/cri/opts.WithoutRunMount` function to `oci.WithoutRunMount`
so that it can be used without dependency on CRI.

Also add `oci.WithoutMounts(dests ...string)` for generality.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-04-07 21:25:36 +09: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
Derek McGowan
261c107ffc Merge pull request #5278 from mxpv/toml 
Migrate TOML to github.com/pelletier/go-toml
 2021-04-01 21:24:52 -07: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
James Sturtevant
d9ff8ebef5 support multi-arch images for windows via ctr 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
 2021-03-31 15:50:01 -07:00
Mike Brown
1b05b605c8 Merge pull request #5145 from aojea/happyeyeballs 
use (sort of) happy-eyeballs for port-forwarding
 2021-03-26 09:51:29 -05: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
Derek McGowan
75a0c2b7d3 Merge pull request #5264 from mxpv/tests 
Run unit tests on CI for MacOS
 2021-03-25 09:46:25 -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
Maksym Pavlenko
4674ad7beb Ignore some tests on darwin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-03-24 22:40:22 -07:00
Maksym Pavlenko
181e2d4216 Merge pull request #5250 from dmcgowan/cri-fix-reference-ordering 
Fix reference ordering in CRI image store
 2021-03-23 14:45:16 -07:00
Sebastiaan van Stijn
708299ca40 Move RunningInUserNS() to its own package 
This allows using the utility without bringing whole of "sys" with it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-03-23 11:29:53 +01:00