openstack/openstack-helm
Code Issues Proposed changes

Merge "Change the documentation table format"

Browse Source
This commit is contained in:
Jenkins 2017-06-28 12:58:16 +00:00 committed by Gerrit Code Review
commit 84f64a5bc3
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
doc/source/install/multinode.rst
View File

@ -17,22 +17,29 @@ this is found throughout the project. If you have any questions or
comments, please create an `issue
<https://bugs.launchpad.net/openstack-helm>`_.
.. warning::
Please see the latest published information about our
application versions.
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
| | Version | Notes |
+==================+======================================================================================+==============================================================================================================+
| **Kubernetes** | `v1.6.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v165>`_ | `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_ |
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
| **Helm** | `v2.3.1 <https://github.com/kubernetes/helm/releases/tag/v2.3.1>`_ | |
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
| **Calico** | `v2.1 <http://docs.projectcalico.org/v2.1/releases/>`_ | `calicoct v1.1 <https://github.com/projectcalico/calicoctl/releases>`_ |
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
| **Docker** | `v1.12.6 <https://github.com/docker/docker/releases/tag/v1.12.6>`_ | `Per kubeadm Instructions <https://kubernetes.io/docs/getting-started-guides/kubeadm/>`_ |
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
.. list-table::
:widths: 45 155 200
:header-rows: 1
* -
- Version
- Notes
* - **Kubernetes**
- `v1.6.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v165>`_
- `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_
* - **Helm**
- `v2.3.1 <https://github.com/kubernetes/helm/releases/tag/v2.3.1>`_
-
* - **Calico**
- `v2.1 <http://docs.projectcalico.org/v2.1/releases/>`_
- `calicoct v1.1 <https://github.com/projectcalico/calicoctl/releases>`_
* - **Docker**
- `v1.12.6 <https://github.com/docker/docker/releases/tag/v1.12.6>`_
- `Per kubeadm Instructions <https://kubernetes.io/docs/getting-started-guides/kubeadm/>`_
Other versions and considerations (such as other CNI SDN providers),
config map data, and value overrides will be included in other