From b7ca8396232ebde62d0481d26e1e22af0b313464 Mon Sep 17 00:00:00 2001 From: aniket-contrail Date: Sat, 25 Mar 2017 16:33:22 -0700 Subject: [PATCH 1/9] Update networking.md Added section on OpenContrail with a brief description. --- docs/concepts/cluster-administration/networking.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/concepts/cluster-administration/networking.md b/docs/concepts/cluster-administration/networking.md index 533a9ee874..55cb1c82ee 100644 --- a/docs/concepts/cluster-administration/networking.md +++ b/docs/concepts/cluster-administration/networking.md @@ -107,6 +107,10 @@ imply any preferential status. [Contiv](https://github.com/contiv/netplugin) provides configurable networking (native l3 using BGP, overlay using vxlan, classic l2, or Cisco-SDN/ACI) for various use cases. [Contiv](http://contiv.io) is all open sourced. +### Contrail + +[Contrail](http://www.juniper.net/us/en/products-services/sdn/contrail/contrail-networking/), based on [OpenContrail](http://www.opencontrail.org), is a truly open, multi-cloud network virtualization and policy management platform. Contrail / OpenContrail is integrated with various orchestration systems such as Kubernetes, OpenShift, OpenStack and Mesos, and provides different isolation modes for virtual machines, containers/pods and bare metal workloads. + ### Flannel [Flannel](https://github.com/coreos/flannel#flannel) is a very simple overlay From b7b1bc94e072023f6a894b9c2eef198951e9cede Mon Sep 17 00:00:00 2001 From: Josh Curl Date: Sat, 25 Mar 2017 23:58:24 -0700 Subject: [PATCH 2/9] Fix typo in authorization docs --- docs/admin/authorization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/authorization.md b/docs/admin/authorization.md index 52e95c3de0..d1f9c21da1 100644 --- a/docs/admin/authorization.md +++ b/docs/admin/authorization.md @@ -516,7 +516,7 @@ current-context: webhook contexts: - context: cluster: name-of-remote-authz-service - user: name-of-api-sever + user: name-of-api-server name: webhook ``` From 7d3f209c8780e8098e1257cca3a51ba5eb85b714 Mon Sep 17 00:00:00 2001 From: yupengzte Date: Mon, 27 Mar 2017 10:34:25 +0800 Subject: [PATCH 3/9] bare-url-used Signed-off-by: yupengzte --- docs/admin/federation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md index bb15fe09ff..8b094cfc95 100644 --- a/docs/admin/federation/index.md +++ b/docs/admin/federation/index.md @@ -245,7 +245,7 @@ federation, and in your federation DNS. You can find more details about config maps in general at -http://kubernetes.io/docs/user-guide/configmap/. +[config map](http://kubernetes.io/docs/user-guide/configmap/). ### Kubernetes 1.4 and earlier: Setting federations flag on kube-dns-rc From 92e1be47119a36c622c0fd208fd08984c07f9b5f Mon Sep 17 00:00:00 2001 From: yupengzte Date: Mon, 27 Mar 2017 10:17:06 +0800 Subject: [PATCH 4/9] Dollar signs used before commands without showing output Signed-off-by: yupengzte --- docs/admin/cluster-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/cluster-management.md b/docs/admin/cluster-management.md index 3aef843d51..8b2c3feb3b 100644 --- a/docs/admin/cluster-management.md +++ b/docs/admin/cluster-management.md @@ -196,7 +196,7 @@ for changes to this variable to take effect. You can use `kubectl convert` command to convert config files between different API versions. ```shell -$ kubectl convert -f pod.yaml --output-version v1 +kubectl convert -f pod.yaml --output-version v1 ``` For more options, please refer to the usage of [kubectl convert](/docs/user-guide/kubectl/kubectl_convert/) command. From b8aa4c661083b9dede37ebac2e4cae7239492da3 Mon Sep 17 00:00:00 2001 From: yupengzte Date: Mon, 27 Mar 2017 10:26:11 +0800 Subject: [PATCH 5/9] Delete the useless spaces Signed-off-by: yupengzte --- docs/admin/cluster-management.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/admin/cluster-management.md b/docs/admin/cluster-management.md index 8b2c3feb3b..f15cde21b8 100644 --- a/docs/admin/cluster-management.md +++ b/docs/admin/cluster-management.md @@ -19,7 +19,7 @@ To install Kubernetes on a set of machines, consult one of the existing [Getting ## Upgrading a cluster -The current state of cluster upgrades is provider dependent, and some releases may require special care when upgrading. It is recommended that administrators consult both the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md), as well as the version specific upgrade notes prior to upgrading their clusters. +The current state of cluster upgrades is provider dependent, and some releases may require special care when upgrading. It is recommended that administrators consult both the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md), as well as the version specific upgrade notes prior to upgrading their clusters. * [Upgrading to 1.6](/docs/admin/upgrade-1-6) @@ -58,12 +58,12 @@ The node upgrade process is user-initiated and is described in the [GKE document ### Upgrading clusters on other platforms -Different providers, and tools, will manage upgrades differently. It is recommended that you consult their main documentation regarding upgrades. +Different providers, and tools, will manage upgrades differently. It is recommended that you consult their main documentation regarding upgrades. * [kops](https://github.com/kubernetes/kops) * [kargo](https://github.com/kubernetes-incubator/kargo) * [CoreOS Tectonic](https://coreos.com/tectonic/docs/latest/admin/upgrade.html) -* ... +* ... ## Resizing a cluster @@ -78,7 +78,6 @@ Instance Group will take care of putting appropriate image on new machines and s In other environments you may need to configure the machine yourself and tell the Kubelet on which machine API server is running. - ### Cluster autoscaling If you are using GCE or GKE, you can configure your cluster so that it is automatically rescaled based on @@ -97,7 +96,7 @@ an extended period of time (10min but it may change in the future). Cluster autoscaler is configured per instance group (GCE) or node pool (GKE). -If you are using GCE then you can either enable it while creating a cluster with kube-up.sh script. +If you are using GCE then you can either enable it while creating a cluster with kube-up.sh script. To configure cluster autoscaler you have to set three environment variables: * `KUBE_ENABLE_CLUSTER_AUTOSCALER` - it enables cluster autoscaler if set to true. From 100daaa7942416b8063d7ae9c009e106f1195273 Mon Sep 17 00:00:00 2001 From: chenhuan12 Date: Mon, 27 Mar 2017 11:18:24 +0800 Subject: [PATCH 6/9] fix the command output fix the command output --- docs/concepts/cluster-administration/manage-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/cluster-administration/manage-deployment.md b/docs/concepts/cluster-administration/manage-deployment.md index aef8bbfaf8..43d833e14b 100644 --- a/docs/concepts/cluster-administration/manage-deployment.md +++ b/docs/concepts/cluster-administration/manage-deployment.md @@ -82,7 +82,7 @@ Because `kubectl` outputs resource names in the same syntax it accepts, it's eas ```shell $ kubectl get $(kubectl create -f docs/user-guide/nginx/ -o name | grep service) NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE -my-nginx-svc 10.0.0.208 80/TCP 0s +my-nginx-svc 10.0.0.208 80/TCP 0s ``` With the above commands, we first create resources under docs/user-guide/nginx/ and print the resources created with `-o name` output format From d48512e387b2ebbe01f11b871688e6652a3b3e85 Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Mon, 27 Mar 2017 09:08:43 -0700 Subject: [PATCH 7/9] Revert "fix the command output" This reverts commit 100daaa7942416b8063d7ae9c009e106f1195273. --- docs/concepts/cluster-administration/manage-deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/cluster-administration/manage-deployment.md b/docs/concepts/cluster-administration/manage-deployment.md index 43d833e14b..aef8bbfaf8 100644 --- a/docs/concepts/cluster-administration/manage-deployment.md +++ b/docs/concepts/cluster-administration/manage-deployment.md @@ -82,7 +82,7 @@ Because `kubectl` outputs resource names in the same syntax it accepts, it's eas ```shell $ kubectl get $(kubectl create -f docs/user-guide/nginx/ -o name | grep service) NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE -my-nginx-svc 10.0.0.208 80/TCP 0s +my-nginx-svc 10.0.0.208 80/TCP 0s ``` With the above commands, we first create resources under docs/user-guide/nginx/ and print the resources created with `-o name` output format From d8e8fb9ffbe19a2daa42870505f29447ead2784a Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Mon, 27 Mar 2017 11:20:42 +0800 Subject: [PATCH 8/9] delete invalid link These two links do not exist yet. --- docs/concepts/storage/volumes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/concepts/storage/volumes.md b/docs/concepts/storage/volumes.md index 762518fc8f..1fe22cdbe8 100644 --- a/docs/concepts/storage/volumes.md +++ b/docs/concepts/storage/volumes.md @@ -44,9 +44,9 @@ medium that backs it, and the contents of it are determined by the particular volume type used. To use a volume, a pod specifies what volumes to provide for the pod (the -[`spec.volumes`](http://kubernetes.io/kubernetes/third_party/swagger-ui/#!/v1/createPod) +`spec.volumes` field) and where to mount those into containers(the -[`spec.containers.volumeMounts`](http://kubernetes.io/kubernetes/third_party/swagger-ui/#!/v1/createPod) +`spec.containers.volumeMounts` field). A process in a container sees a filesystem view composed from their Docker From d920926f121acda33da55d0b2b75dce5c0070b6d Mon Sep 17 00:00:00 2001 From: chenhuan12 Date: Mon, 27 Mar 2017 11:39:23 +0800 Subject: [PATCH 9/9] fix the command output fix the command output --- .../run-stateless-ap-replication-controller.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md b/docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md index 916b923fdc..ada0d36efd 100644 --- a/docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md +++ b/docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md @@ -205,8 +205,8 @@ A successful get command returns all replication controllers on the cluster in the specified or default namespace. For example: ```shell -CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS -frontend php-redis redis name=frontend 2 +NAME DESIRED CURRENT READY AGE +frontend 2 2 2 1h ``` You can also use `get rc NAME` to return information about a specific