openstack/openstack-helm
Code Issues Proposed changes

Merge "Fixing outdated versions and broken links in docs"

Browse Source
This commit is contained in:
Jenkins 2017-06-22 14:44:20 +00:00 committed by Gerrit Code Review
commit 8ae7fa7518
8 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/install/all-in-one.rst
View File

@ -45,8 +45,8 @@ Download and install kubectl, the command line interface for running commands ag
::
KUBE_VERSION=v1.6.0
HELM_VERSION=v2.3.0
KUBE_VERSION=v1.6.5
HELM_VERSION=v2.3.1
TMP_DIR=$(mktemp -d)
curl -sSL https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl
@ -108,15 +108,15 @@ Build
::
export KUBEADM_IMAGE=openstack-helm/kubeadm-aio:v1.6
export KUBEADM_IMAGE=openstack-helm/kubeadm-aio:v1.6.5
sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio
export KUBE_VERSION=v1.6.2
Deploy
------
::
export KUBE_VERSION=v1.6.5
./tools/kubeadm-aio/kubeadm-aio-launcher.sh
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
mkdir -p ${HOME}/.kube

34
doc/source/install/developer/minikube.rst
View File

@ -61,7 +61,7 @@ use the following commands:
# You may need to change these params for your environment. Look up use of --iso-url if needed:
minikube start \
--network-plugin=cni \
--kubernetes-version v1.6.0 \
--kubernetes-version v1.6.5 \
--disk-size 40g \
--memory 16384 \
--cpus 4 \
@ -108,7 +108,7 @@ for Kubernetes during ``minikube start``. More information can be found
minikube start \
--network-plugin=cni \
--kubernetes-version v1.5.1 \
--kubernetes-version v1.6.5 \
--disk-size 40g \
--memory 4048
@ -117,7 +117,7 @@ Next, deploy the `Calico
manifest. This is not a requirement in cases where you want to use your
own CNI-enabled SDN, however you are doing so at your own experience.
Note which versions of Calico are recommended for the project in our
`Installation Guide <../install-multinode.md#overview>`__.
`Installation Guide <../multinode.html#overview>`__.
::
@ -216,17 +216,21 @@ project. If you need to make changes to a chart, simply re-run ``make``
against the project in the top-tier directory. The charts will be
updated and automatically re-pushed to your local repository.
Consider the following when using Minikube and development mode: \*
Persistent Storage used for Minikube development mode is ``hostPath``.
The Ceph PVC's included with this project are not intended to work with
Minikube. \* There is *no need* to install the ``helm-toolkit`` ``ceph``
or ``bootstrap`` charts. These charts are required for deploying Ceph
PVC's. \* Familiarize yourself with ``values.yaml`` included with the
MariaDB chart. You will want to have the ``storage_path`` directory
created prior to deploying MariaDB. This value will be used as the
deployment's ``hostPath``. \* If Ceph development is required, you will
need to follow the `getting started guide <../install-multinode.md>`__
rather than this development mode documentation.
Consider the following when using Minikube and development mode:
- Persistent Storage used for Minikube development mode is ``hostPath``.
The Ceph PVC's included with this project are not intended to work with
Minikube.
- There is *no need* to install the ``helm-toolkit`` ``ceph``
or ``bootstrap`` charts. These charts are required for deploying Ceph
PVC's.
- Familiarize yourself with ``values.yaml`` included with the
MariaDB chart. You will want to have the ``storage_path`` directory
created prior to deploying MariaDB. This value will be used as the
deployment's ``hostPath``.
- If Ceph development is required, you will
need to follow the `getting started guide <../multinode.html>`__
rather than this development mode documentation.
To deploy Openstack-Helm in development mode, ensure you've created a
minikube-approved ``hostPath`` volume. Minikube is very specific about
@ -345,4 +349,4 @@ Troubleshooting
===============
- `Openstack-Helm Minikube
Troubleshooting <../../guides-operator/troubleshooting/ts-development.md>`__
Troubleshooting <../../operator/troubleshooting/development.html>`__

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

@ -25,13 +25,13 @@ comments, please create an `issue
+------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+
| | Version | Notes |
+==================+======================================================================================+==============================================================================================================+
| **Kubernetes** | `v1.6.0 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v155>`_ | `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_ |
| **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.0 <https://github.com/kubernetes/helm/releases/tag/v2.3.0>`_ | |
| **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.1>`_ | `Per kubeadm Instructions <https://kubernetes.io/docs/getting-started-guides/kubeadm/>`_ |
| **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),
@ -120,7 +120,7 @@ manifest:
Setting Up RBAC
---------------
Kubernetes >=v1.6 makes RBAC the default admission controller, OpenStack
Kubernetes >=v1.6 makes RBAC the default admission controller. OpenStack
Helm does not currently have RBAC roles and permissions for each
component so we relax the access control rules:
@ -193,11 +193,11 @@ Please be sure to select the version that matches your Kubernetes installation
(available versions
`here <https://quay.io/repository/attcomdev/kube-controller-manager?tag=latest&tab=tags>`__),
noting that ``kube-controller-manager`` v1.6.1 is also backwards compatible with
Kubernetes v1.6.0.
Kubernetes v1.6.5.
::
export kube_version=v1.6.2
export kube_version=v1.6.5
sudo sed -i "s|gcr.io/google_containers/kube-controller-manager-amd64:$kube_version|quay.io/attcomdev/kube-controller-manager:$kube_version|g" /etc/kubernetes/manifests/kube-controller-manager.yaml
Now you will want to ``restart`` your Kubernetes master server to
@ -485,7 +485,7 @@ StorageClass:
You may want to validate that Ceph is deployed successfully. For more
information on this, please see the section entitled `Ceph
Troubleshooting <../troubleshooting/ts-persistent-storage.md>`__.
Troubleshooting <../../operator/troubleshooting/persistent-storage.html>`__.
MariaDB Installation and Verification
-------------------------------------

2
doc/source/philosophy.rst
View File

@ -54,7 +54,7 @@ hyperscale, such as:
operators to override those replica counts. For some applications, this means
that they support clustering.
* Ensuring clustering style applications are not limited to fixed replica
counts. For instance, we want to ensure that we can support n=Galera members
counts. For instance, we want to ensure that we can support n Galera members
and have those scale linearly, within reason, as opposed to only supporting a
fixed count.
* Duplicate charts of the same type within the same namespace. For example,

1
tools/gate/provision_gate_worker_node.sh
View File

@ -20,6 +20,7 @@ source ${WORK_DIR}/tools/gate/funcs/network.sh
source ${WORK_DIR}/tools/gate/funcs/kube.sh
kubeadm_aio_reqs_install
sudo docker pull ${KUBEADM_IMAGE} || kubeadm_aio_build
# Setup shared mounts for kubelet
sudo mkdir -p /var/lib/kubelet

4
tools/gate/setup_gate.sh
View File

@ -13,8 +13,8 @@
# limitations under the License.
set -ex
export HELM_VERSION=${2:-v2.3.0}
export KUBE_VERSION=${3:-v1.6.4}
export HELM_VERSION=${2:-v2.3.1}
export KUBE_VERSION=${3:-v1.6.5}
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:${KUBE_VERSION}

4
tools/kubeadm-aio/Dockerfile
View File

@ -1,8 +1,8 @@
FROM ubuntu:16.04
MAINTAINER pete.birley@att.com
ENV HELM_VERSION=v2.3.0 \
KUBE_VERSION=v1.6.4 \
ENV HELM_VERSION=v2.3.1 \
KUBE_VERSION=v1.6.5 \
CNI_VERSION=v0.5.2 \
container="docker" \
DEBIAN_FRONTEND="noninteractive"

8
tools/kubeadm-aio/README.rst
View File

@ -31,8 +31,8 @@ You should install the ``kubectl`` and ``helm`` binaries:
.. code:: bash
KUBE_VERSION=v1.6.4
HELM_VERSION=v2.3.0
KUBE_VERSION=v1.6.5
HELM_VERSION=v2.3.1
TMP_DIR=$(mktemp -d)
curl -sSL https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl
@ -67,8 +67,8 @@ To launch the environment then run:
.. code:: bash
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.4
export KUBE_VERSION=v1.6.4
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.5
export KUBE_VERSION=v1.6.5
./tools/kubeadm-aio/kubeadm-aio-launcher.sh
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf