From 553e0917425befee17cee25549226ed9922eca41 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Wed, 14 Jun 2017 14:33:47 -0700 Subject: [PATCH 1/6] install-kubeadm: fix What's Next link text Signed-off-by: Ahmet Alp Balkan --- docs/setup/independent/install-kubeadm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup/independent/install-kubeadm.md b/docs/setup/independent/install-kubeadm.md index d9fee04e31..9b6331244a 100644 --- a/docs/setup/independent/install-kubeadm.md +++ b/docs/setup/independent/install-kubeadm.md @@ -100,7 +100,7 @@ details. {% capture whatsnext %} -* [Installing Kubernetes on Linux with kubeadm](/docs/getting-started-guides/kubeadm/) +* [Using kubeadm to Create a Cluster](/docs/getting-started-guides/kubeadm/) {% endcapture %} From 3c84f8180a7a74739515af9ed66c1780a93ff825 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Wed, 14 Jun 2017 14:23:49 -0700 Subject: [PATCH 2/6] create-cluster-kubeadm: add ToC using task template Signed-off-by: Ahmet Alp Balkan --- docs/setup/independent/create-cluster-kubeadm.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/setup/independent/create-cluster-kubeadm.md b/docs/setup/independent/create-cluster-kubeadm.md index dbe7346598..46727f182d 100644 --- a/docs/setup/independent/create-cluster-kubeadm.md +++ b/docs/setup/independent/create-cluster-kubeadm.md @@ -10,7 +10,7 @@ redirect_from: - "/docs/getting-started-guides/kubeadm.html" --- -## Overview +{% capture overview %} This quickstart shows you how to easily install a Kubernetes cluster on machines running Ubuntu 16.04, CentOS 7 or HypriotOS v1.0.1+. The installation uses a @@ -60,14 +60,18 @@ documented here) are, of course, alpha. **Be sure to read the [limitations](#limitations)**. Specifically, configuring cloud providers is difficult. Upgrades are also not well documented or particularly easy. +{% endcapture %} -## Prerequisites +{% capture prerequisites %} 1. One or more machines running Ubuntu 16.04+, CentOS 7 or HypriotOS v1.0.1+ 1. 1GB or more of RAM per machine (any less will leave little room for your apps) 1. Full network connectivity between all machines in the cluster (public or private network is fine) +{% endcapture %} + +{% capture steps %} ## Objectives @@ -644,3 +648,8 @@ Finally, when running `kubeadm init` you must specify the `--use-kubernetes-vers ```bash kubeadm init --use-kubernetes-version=v1.5.6 ``` + +{% endcapture %} + + +{% include templates/task.md %} From fcbef29da79efe0360bdbc989aa2234a2c5737be Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Wed, 14 Jun 2017 10:41:59 -0700 Subject: [PATCH 3/6] Rephrase doc about Deployment .spec.rollbackTo field --- docs/concepts/workloads/controllers/deployment.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/concepts/workloads/controllers/deployment.md b/docs/concepts/workloads/controllers/deployment.md index f2c16958ee..db77c6b29a 100644 --- a/docs/concepts/workloads/controllers/deployment.md +++ b/docs/concepts/workloads/controllers/deployment.md @@ -866,13 +866,20 @@ a Pod is considered ready, see [Container Probes](/docs/concepts/workloads/pods/ ### Rollback To -`.spec.rollbackTo` is an optional field with the configuration the Deployment is rolling back to. Setting -this field will trigger a rollback, and this field will be cleared every time a rollback is done. +`.spec.rollbackTo` is an optional field with the configuration the Deployment +should roll back to. Setting this field triggers a rollback, and this field will +be cleared by the server after a rollback is done. + +Because this field will be cleared by the server, it should not be used +declaratively. For example, you should not perform `kubectl apply` with a +manifest with `.spec.rollbackTo` field set. #### Revision -`.spec.rollbackTo.revision` is an optional field specifying the revision to rollback to. This defaults -to 0, meaning rollback to the last revision in history. +`.spec.rollbackTo.revision` is an optional field specifying the revision to roll +back to. Setting to 0 means rolling back to the last revision in history; +otherwise, means rolling back to the specified revision. This defaults to 0 when +[`spec.rollbackTo`](#rollback-to) is set. ### Revision History Limit From f527759087f628d51045182a1da1601608400795 Mon Sep 17 00:00:00 2001 From: xilabao Date: Wed, 14 Jun 2017 14:05:28 +0800 Subject: [PATCH 4/6] add the introduce of using wildcard '*' in nonResourceURL --- docs/admin/authorization/rbac.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/authorization/rbac.md b/docs/admin/authorization/rbac.md index ca2f55d951..ac1f826002 100644 --- a/docs/admin/authorization/rbac.md +++ b/docs/admin/authorization/rbac.md @@ -247,7 +247,7 @@ Allow "GET" and "POST" requests to the non-resource endpoint "/healthz" and all ```yaml rules: -- nonResourceURLs: ["/healthz", "/healthz/*"] +- nonResourceURLs: ["/healthz", "/healthz/*"] # '*' in a nonResourceURL is a suffix glob match verbs: ["get", "post"] ``` From 6ce8d8e475235dc4471a0d383752be18acb1f35a Mon Sep 17 00:00:00 2001 From: Elliot Anderson Date: Wed, 14 Jun 2017 15:26:47 +0100 Subject: [PATCH 5/6] Use native patch functionality instead of JQ --- .../configure-pod-container/configure-service-account.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/tasks/configure-pod-container/configure-service-account.md b/docs/tasks/configure-pod-container/configure-service-account.md index 1dd92774e6..4c8aecf290 100644 --- a/docs/tasks/configure-pod-container/configure-service-account.md +++ b/docs/tasks/configure-pod-container/configure-service-account.md @@ -175,14 +175,10 @@ NAME TYPE DATA AGE myregistrykey   kubernetes.io/.dockerconfigjson   1       1d ``` -Next, read/modify/write the service account for the namespace to use this secret as an imagePullSecret. +Next, modify the default service account for the namespace to use this secret as an imagePullSecret. -Automated version using json and the jq utility: ```shell -kubectl get serviceaccounts default -o json | - jq 'del(.metadata.resourceVersion)'| - jq 'setpath(["imagePullSecrets"];[{"name":"myregistrykey"}])' | - kubectl replace serviceaccount default -f - +kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "myregistrykey"}]}' ``` From 7047cdefbfcc97c79df704b29eb812779ded5f5f Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 21 Jun 2017 02:44:37 +0530 Subject: [PATCH 6/6] fixes typos and corrects links in the minikube guide (#4051) --- docs/getting-started-guides/minikube.md | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/getting-started-guides/minikube.md b/docs/getting-started-guides/minikube.md index 5ce3f6bde8..8ef8b78cb0 100644 --- a/docs/getting-started-guides/minikube.md +++ b/docs/getting-started-guides/minikube.md @@ -149,7 +149,7 @@ To use this feature, you can use the `--extra-config` flag on the `minikube star This flag is repeated, so you can pass it several times with several different values to set multiple options. -This flag takes a string of the form `component.key=value`, where `component` is one of the strings from the above list, `key` is a value on the +This flag takes a string of the form `component.key=value`, where `component` is one of the strings from the below list, `key` is a value on the configuration struct and `value` is the value to set. Valid `key`s can be found by examining the documentation for the Kubernetes `componentconfigs` for each component. @@ -226,7 +226,7 @@ However, Minikube is configured to persist files stored under the following host * `/var/lib/localkube` * `/var/lib/docker` -Here is an example PersistentVolume config to persist data in the '/data' directory: +Here is an example PersistentVolume config to persist data in the `/data` directory: ```yaml apiVersion: v1 @@ -243,13 +243,15 @@ spec: ``` ## Mounted Host Folders -Some drivers will mount a host folder within the VM so that you can easily share files between the VM and host. These are not configurable at the moment and different for the driver and OS you are using. Note: Host folder sharing is not implemented in the KVM driver yet. +Some drivers will mount a host folder within the VM so that you can easily share files between the VM and host. These are not configurable at the moment and different for the driver and OS you are using. + +**Note:** Host folder sharing is not implemented in the KVM driver yet. | Driver | OS | HostFolder | VM | | --- | --- | --- | --- | -| Virtualbox | Linux | /home | /hosthome | -| Virtualbox | OSX | /Users | /Users | -| Virtualbox | Windows | C://Users | /c/Users | +| VirtualBox | Linux | /home | /hosthome | +| VirtualBox | OSX | /Users | /Users | +| VirtualBox | Windows | C://Users | /c/Users | | VMWare Fusion | OSX | /Users | /Users | | Xhyve | OSX | /Users | /Users | @@ -258,11 +260,11 @@ Some drivers will mount a host folder within the VM so that you can easily share To access a private container registry, follow the steps on [this page](/docs/concepts/containers/images/). -We recommend you use ImagePullSecrets, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/home/docker/.docker` directory. +We recommend you use `ImagePullSecrets`, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/home/docker/.docker` directory. ## Add-ons -In order to have minikube properly start/restart custom addons, place the addons you wish to be launched with minikube in the `.minikube/addons` directory. Addons in this folder will be moved to the minikubeVM and launched each time minikube is started/restarted. +In order to have minikube properly start/restart custom addons, place the addons you wish to be launched with minikube in the `~/.minikube/addons` directory. Addons in this folder will be moved to the minikubeVM and launched each time minikube is started/restarted. ## Using Minikube with an HTTP Proxy @@ -293,12 +295,13 @@ Minikube uses [libmachine](https://github.com/docker/machine/tree/master/libmach For more information about minikube, see the [proposal](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/local-cluster-ux.md). ## Additional Links: -* **Goals and Non-Goals**: For the goals and non-goals of the minikube project, please see our [roadmap](https://github.com/kubernetes/minikube/blob/master/ROADMAP.md). +* **Goals and Non-Goals**: For the goals and non-goals of the minikube project, please see our [roadmap](https://github.com/kubernetes/minikube/blob/master/docs/contributors/roadmap.md). * **Development Guide**: See [CONTRIBUTING.md](https://github.com/kubernetes/minikube/blob/master/CONTRIBUTING.md) for an overview of how to send pull requests. -* **Building Minikube**: For instructions on how to build/test minikube from source, see the [build guide](https://github.com/kubernetes/minikube/blob/master/BUILD_GUIDE.md) -* **Adding a New Dependency**: For instructions on how to add a new dependency to minikube see the [adding dependencies guide](https://github.com/kubernetes/minikube/blob/master/ADD_DEPENDENCY.md) -* **Updating Kubernetes**: For instructions on how to add a new dependency to minikube see the [updating Kubernetes guide](https://github.com/kubernetes/minikube/blob/master/UPDATE_KUBERNETES.md) +* **Building Minikube**: For instructions on how to build/test minikube from source, see the [build guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/build_guide.md) +* **Adding a New Dependency**: For instructions on how to add a new depeindency to minikube see the [adding dependencies guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/adding_a_dependency.md) +* **Adding a New Addon**: For instruction on how to add a new addon for minikube see the [adding an addon guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/adding_an_addon.md) +* **Updating Kubernetes**: For instructions on how to update kubernetes see the [updating Kubernetes guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/updating_kubernetes.md) ## Community -Contributions, questions, and comments are all welcomed and encouraged! minkube developers hang out on [Slack](https://kubernetes.slack.com) in the #minikube channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [kubernetes-dev Google Groups mailing list](https://groups.google.com/forum/#!forum/kubernetes-dev). If you are posting to the list please prefix your subject with "minikube: ". +Contributions, questions, and comments are all welcomed and encouraged! minikube developers hang out on [Slack](https://kubernetes.slack.com) in the #minikube channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [kubernetes-dev Google Groups mailing list](https://groups.google.com/forum/#!forum/kubernetes-dev). If you are posting to the list please prefix your subject with "minikube: ".