summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-08-22 05:10:35 -0700
committerGitHub <noreply@github.com>2017-08-22 05:10:35 -0700
commit2c8c545bed4723affb214e86f903e89793955ef4 (patch)
tree956f24fef52f36c3a7b6b348339afbe35e22d20d
parent3bc654329652d73bb0edba26dca209b1f69c7b26 (diff)
parent473a7eb14087807598c86a9803701384add0181f (diff)
Merge pull request #965 from wackxu/patch-12
Automatic merge from submit-queue Update sysctl.md
-rw-r--r--contributors/design-proposals/sysctl.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/sysctl.md b/contributors/design-proposals/sysctl.md
index d24c18ee..55879e2b 100644
--- a/contributors/design-proposals/sysctl.md
+++ b/contributors/design-proposals/sysctl.md
@@ -234,7 +234,7 @@ Applied changes:
### Rkt support for sysctl
-The only sysctl support in rkt is through a [CNI plugin](https://github.com/containernetworking/cni/blob/master/Documentation/tuning.md) plugin. The Kubernetes network plugin `kubenet` can easily be extended to call this with a given list of sysctls during pod launch.
+The only sysctl support in rkt is through a [CNI plugin](https://github.com/containernetworking/plugins/blob/master/plugins/meta/tuning/README.md) plugin. The Kubernetes network plugin `kubenet` can easily be extended to call this with a given list of sysctls during pod launch.
The default network plugin for rkt is `no-op` though. This mode leaves all network initialization to rkt itself. Rkt in turn uses the static CNI plugin configuration in `/etc/rkt/net.d`. This does not allow to customize the sysctls for a pod. Hence, in order to implement this proposal in `no-op` mode additional changes in rkt are necessary.