diff --git a/doc/source/install/all-in-one.rst b/doc/source/install/all-in-one.rst index 6a8a699ee7..690efd3218 100644 --- a/doc/source/install/all-in-one.rst +++ b/doc/source/install/all-in-one.rst @@ -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 diff --git a/doc/source/install/developer/minikube.rst b/doc/source/install/developer/minikube.rst index ebdf20c4c2..b89ca01dcd 100644 --- a/doc/source/install/developer/minikube.rst +++ b/doc/source/install/developer/minikube.rst @@ -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>`__ diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index ebbf08d588..a8f3fb4a65 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -25,13 +25,13 @@ comments, please create an `issue +------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+ | | Version | Notes | +==================+======================================================================================+==============================================================================================================+ - | **Kubernetes** | `v1.6.0 `_ | `Custom Controller for RDB tools `_ | + | **Kubernetes** | `v1.6.5 `_ | `Custom Controller for RDB tools `_ | +------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+ - | **Helm** | `v2.3.0 `_ | | + | **Helm** | `v2.3.1 `_ | | +------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+ | **Calico** | `v2.1 `_ | `calicoct v1.1 `_ | +------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+ - | **Docker** | `v1.12.6 `_ | `Per kubeadm Instructions `_ | + | **Docker** | `v1.12.6 `_ | `Per kubeadm Instructions `_ | +------------------+--------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------+ 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 `__), 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 ------------------------------------- diff --git a/doc/source/philosophy.rst b/doc/source/philosophy.rst index 89c78a19a7..5badde9a53 100644 --- a/doc/source/philosophy.rst +++ b/doc/source/philosophy.rst @@ -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, diff --git a/tools/gate/provision_gate_worker_node.sh b/tools/gate/provision_gate_worker_node.sh index 7bcd64c5db..1f236163f7 100755 --- a/tools/gate/provision_gate_worker_node.sh +++ b/tools/gate/provision_gate_worker_node.sh @@ -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 diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh index 4cd0afa572..5712cf956d 100755 --- a/tools/gate/setup_gate.sh +++ b/tools/gate/setup_gate.sh @@ -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} diff --git a/tools/kubeadm-aio/Dockerfile b/tools/kubeadm-aio/Dockerfile index 897a3eb13d..90e9d32ea2 100644 --- a/tools/kubeadm-aio/Dockerfile +++ b/tools/kubeadm-aio/Dockerfile @@ -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" diff --git a/tools/kubeadm-aio/README.rst b/tools/kubeadm-aio/README.rst index 7301761b48..dd9ac2ce18 100644 --- a/tools/kubeadm-aio/README.rst +++ b/tools/kubeadm-aio/README.rst @@ -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