diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-11-13 05:46:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 05:46:23 -0800 |
| commit | 76f2ea47956e0463a1fe6da49d8e13e8b2567eec (patch) | |
| tree | 6a1103796b4288025db7cc6d3b80634533cdfb80 | |
| parent | 17a2379a721e5b04a14b754085288a8b2506c0c2 (diff) | |
| parent | d1ac4c17d92448c3b8fa1f46b12739aad1262c77 (diff) | |
Merge pull request #1392 from purpuregecko/master
Automatic merge from submit-queue.
fix links to CRI. issue #1391
| -rw-r--r-- | contributors/design-proposals/architecture/architecture.md | 2 | ||||
| -rw-r--r-- | contributors/design-proposals/auth/apparmor.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contributors/design-proposals/architecture/architecture.md b/contributors/design-proposals/architecture/architecture.md index 367d7e20..182d1d1c 100644 --- a/contributors/design-proposals/architecture/architecture.md +++ b/contributors/design-proposals/architecture/architecture.md @@ -214,7 +214,7 @@ agent. Each node runs a container runtime, which is responsible for downloading images and running containers. Kubelet does not link in the base container runtime. Instead, we're defining a -[Container Runtime Interface](container-runtime-interface-v1.md) to control the +[Container Runtime Interface](/contributors/devel/container-runtime-interface.md) to control the underlying runtime and facilitate pluggability of that layer. This decoupling is needed in order to maintain clear component boundaries, facilitate testing, and facilitate pluggability. Runtimes supported today, either upstream or by forks, include at least docker (for Linux and Windows), diff --git a/contributors/design-proposals/auth/apparmor.md b/contributors/design-proposals/auth/apparmor.md index 34ecf978..a88154bb 100644 --- a/contributors/design-proposals/auth/apparmor.md +++ b/contributors/design-proposals/auth/apparmor.md @@ -268,7 +268,7 @@ already underway for Docker, called ## Container Runtime Interface Other container runtimes will likely add AppArmor support eventually, so the -[Container Runtime Interface](container-runtime-interface-v1.md) (CRI) needs to be made compatible +[Container Runtime Interface](/contributors/devel/container-runtime-interface.md) (CRI) needs to be made compatible with this design. The two important pieces are a way to report whether AppArmor is supported by the runtime, and a way to specify the profile to load (likely through the `LinuxContainerConfig`). |