From 94ee42f6588192fbd7bd7ba263952df7197a641e Mon Sep 17 00:00:00 2001 From: xilabao Date: Mon, 26 Dec 2016 01:48:55 -0600 Subject: [PATCH 01/15] Add rbac command to kubectl get --help reference to https://github.com/kubernetes/kubernetes/pull/37366 --- docs/user-guide/kubectl-overview.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/user-guide/kubectl-overview.md b/docs/user-guide/kubectl-overview.md index 99c1575e84..31b55f161f 100644 --- a/docs/user-guide/kubectl-overview.md +++ b/docs/user-guide/kubectl-overview.md @@ -84,6 +84,8 @@ The following table includes a list of all the supported resource types and thei Resource type | Abbreviated alias -------------------- | -------------------- `clusters` | +`clusterrolebindings` | +`clusterroles` | `componentstatuses` |`cs` `configmaps` |`cm` `daemonsets` |`ds` @@ -105,6 +107,8 @@ Resource type | Abbreviated alias `replicasets` |`rs` `replicationcontrollers` |`rc` `resourcequotas` |`quota` +`rolebindings` | +`roles` | `secrets` | `serviceaccounts` |`sa` `services` |`svc` From d420bea04c269f58fa3708dfa3ed4b8bad0d9bbe Mon Sep 17 00:00:00 2001 From: Premanand Chandrasekaran Date: Wed, 28 Dec 2016 06:36:52 -0500 Subject: [PATCH 02/15] Minor correction --- docs/user-guide/kubectl/kubectl_config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/kubectl/kubectl_config.md b/docs/user-guide/kubectl/kubectl_config.md index 441db2334a..c19e98d381 100644 --- a/docs/user-guide/kubectl/kubectl_config.md +++ b/docs/user-guide/kubectl/kubectl_config.md @@ -14,7 +14,7 @@ Modify kubeconfig files using subcommands like "kubectl config set current-conte The loading order follows these rules: 1. If the --kubeconfig flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. - 2. If $KUBECONFIG environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. + 2. If $KUBECONFIG environment variable is set, then it is used as a list of paths (normal path delimitting rules for your system). These paths are merged. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. 3. Otherwise, ${HOME}/.kube/config is used and no merging takes place. ``` From 9cd582fd7ad285280c3340799a50f1512c69d23f Mon Sep 17 00:00:00 2001 From: Alexander Kanevskiy Date: Fri, 23 Dec 2016 15:40:01 +0200 Subject: [PATCH 03/15] Append note about content and format of /etc/kubernetes/cloud-config. --- docs/admin/kubeadm.md | 3 +++ docs/getting-started-guides/kubeadm.md | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md index 71095d0577..1014ee1ab6 100644 --- a/docs/admin/kubeadm.md +++ b/docs/admin/kubeadm.md @@ -84,6 +84,9 @@ Valid values are the ones supported by `controller-manager`, namely `"aws"`, the cloud provider, you should create a `/etc/kubernetes/cloud-config` file manually, before running `kubeadm init`. `kubeadm` automatically picks those settings up and ensures other nodes are configured correctly. +The exact format and content of the file `/etc/kubernetes/cloud-config` depends +on the type you specified for `--cloud-provider`; see the appropriate documentation +for your cloud provider for details. You must also set the `--cloud-provider` and `--cloud-config` parameters yourself by editing the `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` file appropriately. diff --git a/docs/getting-started-guides/kubeadm.md b/docs/getting-started-guides/kubeadm.md index d3ae5a2cad..74d2f18906 100644 --- a/docs/getting-started-guides/kubeadm.md +++ b/docs/getting-started-guides/kubeadm.md @@ -319,8 +319,9 @@ edit the `kubeadm` dropin for the `kubelet` service (`/etc/systemd/system/kubele If your cloud provider requires any extra packages installed on host, for example for volume mounting/unmounting, install those packages. Specify the `--cloud-provider` flag to kubelet and set it to the cloud of your choice. If your cloudprovider requires a configuration -file, create the file `/etc/kubernetes/cloud-config` on every node and set the values your cloud requires. Also append -`--cloud-config=/etc/kubernetes/cloud-config` to the kubelet arguments. +file, create the file `/etc/kubernetes/cloud-config` on every node. The exact format and content of that file depends on the requirements imposed by your cloud provider. +If you use the `/etc/kubernetes/cloud-config` file, you must append it to the `kubelet` arguments as follows: +`--cloud-config=/etc/kubernetes/cloud-config` Lastly, run `kubeadm init --cloud-provider=xxx` to bootstrap your cluster with cloud provider features. From eb4cbf9ef0aa44e47b96d355f5b196288db3c642 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 30 Dec 2016 12:49:42 -0500 Subject: [PATCH 04/15] Don't overwrite the global `page` object when building the table of contents --- _includes/tree.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/tree.html b/_includes/tree.html index 4aeaeb0176..78505504f1 100644 --- a/_includes/tree.html +++ b/_includes/tree.html @@ -12,9 +12,9 @@ {% assign path = item.path %} {% assign title = item.title %} {% else %} - {% assign page = site.pages | where: "path", item | first %} - {% assign title = page.title %} - {% assign path = page.url %} + {% assign found_page = site.pages | where: "path", item | first %} + {% assign title = found_page.title %} + {% assign path = found_page.url %} {% endif %} {% endcapture %} From 1cc17e5fbc2e11c42cfdb2f2047ede8069bb272c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Tue, 3 Jan 2017 08:13:26 +1100 Subject: [PATCH 05/15] fix(#1710): volume behavior is not documented MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikaël Cluseau --- docs/user-guide/volumes.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/user-guide/volumes.md b/docs/user-guide/volumes.md index f2b5ff88a0..762518fc8f 100644 --- a/docs/user-guide/volumes.md +++ b/docs/user-guide/volumes.md @@ -531,6 +531,39 @@ before you can use it__ See the [Quobyte example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/quobyte) for more details. +## Using subPath + +Sometimes, it is useful to share one volume for multiple uses in a single pod. The `volumeMounts.subPath` +property can be used to specify a sub-path inside the referenced volume instead of its root. + +Here is an example of a pod with a LAMP stack (Linux Apache Mysql PHP) using a single, shared volume. +The HTML contents are mapped to its `html` folder, and the databases will be stored in its `mysql` folder: + +```yaml +apiVersion: v1 +kind: Pod +metadata: + name: my-lamp-site +spec: + containers: + - name: mysql + image: mysql + volumeMounts: + - mountPath: /var/lib/mysql + name: site-data + subPath: mysql + - name: php + image: php + volumeMounts: + - mountPath: /var/www/html + name: site-data + subPath: html + volumes: + - name: site-data + persistentVolumeClaim: + claimName: my-lamp-site-data +``` + ## Resources The storage media (Disk, SSD, etc.) of an `emptyDir` volume is determined by the From 3ff8fd7a2c0cf7b2df6a2329d3689054eb50dbad Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 10:48:19 -0800 Subject: [PATCH 06/15] Update deprecation-policy.md --- docs/deprecation-policy.md | 95 +++++++++++++++++++++++++++++++++----- 1 file changed, 83 insertions(+), 12 deletions(-) diff --git a/docs/deprecation-policy.md b/docs/deprecation-policy.md index 14db737d13..7f7011c6c8 100644 --- a/docs/deprecation-policy.md +++ b/docs/deprecation-policy.md @@ -84,18 +84,89 @@ which supports a particular API group. A new Kubernetes release is made every approximately 3 months (4 per year). The following table describes which API versions are supported in a series of subsequent releases. -| Release | API versions | Notes | -|---------|--------------|-------| -| X | v1 | | -| X+1 | v1, v2alpha1 | | -| X+2 | v1, v2alpha2 | * v2alpha1 is removed, "action required" relnote | -| X+3 | v1, v2beta1 | * v2alpha2 is removed, "action required" relnote | -| X+4 | v1, v2beta1, v2beta2 | * v2beta1 is deprecated, "action required" relnote | -| X+5 | v1, v2, v2beta2 | * v2beta1 is removed, "action required" relnote
* v2beta2 is deprecated, "action required" relnote
* v1 is deprecated, "action required" relnote | -| X+6 | v1, v2 | * v2beta2 is removed, "action required" relnote | -| X+7 | v1, v2 | | -| X+8 | v1, v2 | | -| X+9 | v2 | * v1 is removed, "action required" relnote | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReleaseAPI VersionsNotes
Xv1
X+1v1, v2alpha1
X+2v1, v2alpha2 +
    +
  • v2alpha1 is removed, "action required" relnote
    • +
+
X+3v1, v2beta1 +
    +
  • v2alpha2 is removed, "action required" relnote
    • +
+
X+4v1, v2beta1, v2beta2 +
    +
  • v2beta1 is deprecated, "action required" relnote
    • +
+
X+5v1, v2, v2beta2 +
    +
  • v2beta1 is removed, "action required" relnote
    • +
  • v2beta2 is deprecated, "action required" relnote
    • +
  • v1 is deprecated, "action required" relnote
    • +
+
X+6v1, v2 +
    +
  • v2beta2 is removed, "action required" relnote
    • +
+
X+7v1, v2
X+8v1, v2
X+9v1, v2 +
    +
  • v1 is removed, "action required" relnote
    • +
+
### REST resources (aka API objects) From 31bcde91223e6254cdf92e52c4078ffd63151659 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 10:55:16 -0800 Subject: [PATCH 07/15] Update deprecation-policy.md --- docs/deprecation-policy.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/deprecation-policy.md b/docs/deprecation-policy.md index 7f7011c6c8..dbc999a0c7 100644 --- a/docs/deprecation-policy.md +++ b/docs/deprecation-policy.md @@ -6,8 +6,6 @@ assignees: --- -# Kubernetes Deprecation Policy - Kubernetes is a large system with many components and many contributors. As with any such software, the feature set naturally evolves over time, and sometimes a feature may need to be removed. This could include an API, a flag, From 0f462317ca3611b8c68210419d2f828db7cc9fe7 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 10:58:59 -0800 Subject: [PATCH 08/15] Update deprecation-policy.md --- docs/deprecation-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deprecation-policy.md b/docs/deprecation-policy.md index dbc999a0c7..fb17613ca1 100644 --- a/docs/deprecation-policy.md +++ b/docs/deprecation-policy.md @@ -3,7 +3,7 @@ assignees: - bgrant0607 - lavalamp - thockin - +title: Kubernetes Deprecation Policy --- Kubernetes is a large system with many components and many contributors. As From 94aafc061ac46f35878ffffea669a236f723c6b2 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 11:38:03 -0800 Subject: [PATCH 09/15] Null PR with 0 changes to clear extraneous commits (#2119) * WIP: New Docs Landing Page and ToC Organization. * More changes to Landing Page/TOC nav. * Debugging fixes to TOC. * More debugging and wording changes to site nav and TOCs. * More debugging fixes for site nav and TOC. * Yet more debugging fixes to site nav and TOC. * Initial edit to Docs landing page. * Debug edit. * Attempt at removing left-nav TOC from Docs Landing Page. * Incremental fix for docs landing page. * More incremental layout fixes for landing page. * Incremental change. * CSS fixes; fills out landing page with additional information. * More layout fixes. * More layout and text edits for the docs landing page. * More tinkering with CSS and layouts; fixed a hanging tag. * Last tweak for now. * Modified text in response to review comments. * Removed Samples and Contribution Evangelism from docs landing page. * Removed intro text on Docs landing page. * Reorganized landing page to drop weird CSS formatting and reorganize "Quickstarts" into setup guidance; separated out tutorial. Corrected spelling error in main page header. * Fixed links to major subsections (Guides/Tutorials/Tasks/Concepts). Clarified /current/ usage of each--subject to change as Guides get deprecated and Tutorials get filled out. Changed description for kubeadm/kops links to mention that they are newer/experimental ways to set up Kubernetes. * Corrected Guides link. From 8879175f851a8b914e345fa189e96e4fa00f7351 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 3 Jan 2017 12:37:15 -0800 Subject: [PATCH 10/15] Use thead/tbody style for manual table --- docs/deprecation-policy.md | 166 +++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 81 deletions(-) diff --git a/docs/deprecation-policy.md b/docs/deprecation-policy.md index fb17613ca1..bd7645ea49 100644 --- a/docs/deprecation-policy.md +++ b/docs/deprecation-policy.md @@ -83,87 +83,91 @@ approximately 3 months (4 per year). The following table describes which API versions are supported in a series of subsequent releases. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReleaseAPI VersionsNotes
Xv1
X+1v1, v2alpha1
X+2v1, v2alpha2 -
    -
  • v2alpha1 is removed, "action required" relnote
    • -
-
X+3v1, v2beta1 -
    -
  • v2alpha2 is removed, "action required" relnote
    • -
-
X+4v1, v2beta1, v2beta2 -
    -
  • v2beta1 is deprecated, "action required" relnote
    • -
-
X+5v1, v2, v2beta2 -
    -
  • v2beta1 is removed, "action required" relnote
    • -
  • v2beta2 is deprecated, "action required" relnote
    • -
  • v1 is deprecated, "action required" relnote
    • -
-
X+6v1, v2 -
    -
  • v2beta2 is removed, "action required" relnote
    • -
-
X+7v1, v2
X+8v1, v2
X+9v1, v2 -
    -
  • v1 is removed, "action required" relnote
    • -
-
ReleaseAPI VersionsNotes
Xv1
X+1v1, v2alpha1
X+2v1, v2alpha2 +
    +
  • v2alpha1 is removed, "action required" relnote
    • +
+
X+3v1, v2beta1 +
    +
  • v2alpha2 is removed, "action required" relnote
    • +
+
X+4v1, v2beta1, v2beta2 +
    +
  • v2beta1 is deprecated, "action required" relnote
    • +
+
X+5v1, v2, v2beta2 +
    +
  • v2beta1 is removed, "action required" relnote
    • +
  • v2beta2 is deprecated, "action required" relnote
    • +
  • v1 is deprecated, "action required" relnote
    • +
+
X+6v1, v2 +
    +
  • v2beta2 is removed, "action required" relnote
    • +
+
X+7v1, v2
X+8v1, v2
X+9v1, v2 +
    +
  • v1 is removed, "action required" relnote
    • +
+
### REST resources (aka API objects) From 20c51c8c96c30c662855cad754cfc8ca50f30643 Mon Sep 17 00:00:00 2001 From: Elijah Caine Date: Tue, 3 Jan 2017 12:57:40 -0800 Subject: [PATCH 11/15] ReplicaSets: Correct paragraph spacing error --- docs/user-guide/replicasets.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/user-guide/replicasets.md b/docs/user-guide/replicasets.md index 769ea58c02..ea3e7bde14 100644 --- a/docs/user-guide/replicasets.md +++ b/docs/user-guide/replicasets.md @@ -37,7 +37,6 @@ their ReplicaSets. A ReplicaSet ensures that a specified number of pod “replicas” are running at any given time. However, a Deployment is a higher-level concept that manages ReplicaSets and - provides declarative updates to pods along with a lot of other useful features. Therefore, we recommend using Deployments instead of directly using ReplicaSets, unless you require custom update orchestration or don't require updates at all. From 70a269dd65d52a86573e8c753060b2cb557df0c7 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 14:02:18 -0800 Subject: [PATCH 12/15] Update support.yml --- _data/support.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/support.yml b/_data/support.yml index efb049ccb1..ca1c96819a 100644 --- a/_data/support.yml +++ b/_data/support.yml @@ -39,3 +39,5 @@ toc: path: https://github.com/kubernetes/kubernetes/releases/ - title: Release Roadmap path: https://github.com/kubernetes/kubernetes/milestones/ + - title: Deprecation Policy + path: docs/deprecation-policy.md From 1a7a8b9ce0a2689919036730b8d227255d37c1d1 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 14:09:49 -0800 Subject: [PATCH 13/15] Update support.yml --- _data/support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/support.yml b/_data/support.yml index ca1c96819a..68142ca44c 100644 --- a/_data/support.yml +++ b/_data/support.yml @@ -40,4 +40,4 @@ toc: - title: Release Roadmap path: https://github.com/kubernetes/kubernetes/milestones/ - title: Deprecation Policy - path: docs/deprecation-policy.md + path: /docs/deprecation-policy.md From 611f07ba03938ce2afd0af4ae79423bf726a8f99 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 3 Jan 2017 14:11:48 -0800 Subject: [PATCH 14/15] Newline required before bullet-lists --- docs/deprecation-policy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/deprecation-policy.md b/docs/deprecation-policy.md index bd7645ea49..d349e6c0b9 100644 --- a/docs/deprecation-policy.md +++ b/docs/deprecation-policy.md @@ -73,6 +73,7 @@ version. Beta API versions *may not* replace GA API versions. **Rule #4: Other than the most recent API version in each track, older API versions must be supported after their announced deprecation for a duration of no less than:** + * **GA: 1 year or 2 releases (whichever is longer)** * **Beta: 3 months or 1 release (whichever is longer)** * **Alpha: 0 releases** @@ -220,12 +221,14 @@ follows: **Rule #5a: CLI elements of user-facing components (e.g. kubectl) must function after their announced deprecation for no less than:** + * **GA: 1 year or 2 releases (whichever is longer)** * **Beta: 3 months or 1 release (whichever is longer)** * **Alpha: 0 releases** **Rule #5b: CLI elements of admin-facing components (e.g. kubelet) must function after their announced deprecation for no less than:** + * **GA: 6 months or 1 release (whichever is longer)** * **Beta: 3 months or 1 release (whichever is longer)** * **Alpha: 0 releases** From 01caaf43cf15fc94d18bcc7147982253ec78888d Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Tue, 3 Jan 2017 14:21:45 -0800 Subject: [PATCH 15/15] Update support.yml --- _data/support.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_data/support.yml b/_data/support.yml index 68142ca44c..8647d1456d 100644 --- a/_data/support.yml +++ b/_data/support.yml @@ -39,5 +39,6 @@ toc: path: https://github.com/kubernetes/kubernetes/releases/ - title: Release Roadmap path: https://github.com/kubernetes/kubernetes/milestones/ - - title: Deprecation Policy - path: /docs/deprecation-policy.md + +- title: Deprecation Policy + path: /docs/deprecation-policy.md