From be2d47401decd0b1277ccffb4d8a1ebdad86d60b Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 24 Jun 2016 11:30:14 -0700 Subject: [PATCH] rkt: Minor refactoring. --- docs/getting-started-guides/rkt/index.md | 9 ++++----- docs/getting-started-guides/rkt/notes.md | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/getting-started-guides/rkt/index.md b/docs/getting-started-guides/rkt/index.md index 764ed2e0e5..ac79c3ac7b 100644 --- a/docs/getting-started-guides/rkt/index.md +++ b/docs/getting-started-guides/rkt/index.md @@ -3,7 +3,7 @@ This document describes how to run Kubernetes using [rkt](https://github.com/coreos/rkt) as a container runtime. -### **Prerequisite** +### Prerequisite - [systemd](http://www.freedesktop.org/wiki/Software/systemd/) should be installed on the machine and should be enabled. The minimum version required for Kubernetes 1.3 is `219`. @@ -25,7 +25,7 @@ In addition, rkt supports using rkt's [Contained Networking](https://coreos.com/ In this mode, rkt will attempt to join pods into a network named `rkt.kubernetes.io`. To use rkt's contained networking, you can leave the `--network-plugin` to empty, and put a network config file under one of the rkt's [config directories](https://github.com/coreos/rkt/blob/master/Documentation/configuration.md#command-line-flags), for example: -```shell +```shell $ cat </etc/rkt/net.d/k8s_network_example.conf { "name": "rkt.kubernetes.io", @@ -75,8 +75,7 @@ For more information on flannel configuration, please read [CNI/flannel README]( ##### Use Google Compute Engine (GCE) network Each VM on GCE has an additional 256 IP addresses routed to it, so it is possible to forego flannel in smaller clusters. -This can most easily be done by using the builtin kubenet plugin. -This can be done by setting `--network-plugin=kubenet`. +This can most easily be done by using the builtin kubenet plugin, by setting the kubelet flag `--network-plugin=kubenet`. ### Launch a local cluster @@ -104,7 +103,7 @@ Then we can launch the local cluster using the script: $ hack/local-up-cluster.sh ``` -We are also working on set up rkt as the container runtime for [minikube](https://github.com/kubernetes/minikube/issues/168). +We are also working on setting up rkt as the container runtime for [minikube](https://github.com/kubernetes/minikube/issues/168). ### Launch a CoreOS/rkt cluster on Google Compute Engine (GCE) diff --git a/docs/getting-started-guides/rkt/notes.md b/docs/getting-started-guides/rkt/notes.md index 61e9676ba4..8e53481046 100644 --- a/docs/getting-started-guides/rkt/notes.md +++ b/docs/getting-started-guides/rkt/notes.md @@ -1,8 +1,6 @@ --- --- -# Known issues - The following features either are not supported or have large caveats when using the rkt container runtime. ##### Non-existent host volume paths @@ -37,9 +35,9 @@ spec: The `kubectl attach` command does not work under the rkt container runtime. And because of this, some flags in `kubectl run` are not supported, including: -- --attach=true -- --leave-stdin-open=true -- --rm=true +- `--attach=true` +- `--leave-stdin-open=true` +- `--rm=true` ##### Init containers @@ -84,7 +82,7 @@ On the other hand, when running the pod with [stage1-fly](https://coreos.com/rkt Patching a pod to change the image will result in the entire pod restarting, not just the container that was changed. -##### Volume mounts specifying a subPath +##### Volume mounts specifying a subPath The [subPath](https://github.com/kubernetes/kubernetes/pull/22575) feature does not work correctly under rkt. In addition, the above-issue of Non-existent host volume paths being invalid would make many common use-cases for subPaths fail in that way as well.