diff --git a/ceph/values.yaml b/ceph/values.yaml index dbe66fc694..e9f7f6b7ea 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -29,7 +29,7 @@ images: bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 - ceph_config_helper: docker.io/port/ceph-config-helper:v1.6.7 + ceph_config_helper: docker.io/port/ceph-config-helper:v1.6.8 pull_policy: "IfNotPresent" labels: diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst index 837c947a20..b6bb88bc42 100644 --- a/doc/source/install/developer/all-in-one.rst +++ b/doc/source/install/developer/all-in-one.rst @@ -69,7 +69,7 @@ against your Kubernetes cluster. :: - export KUBE_VERSION=v1.6.7 + export KUBE_VERSION=v1.6.8 export HELM_VERSION=v2.5.1 export TMP_DIR=$(mktemp -d) @@ -136,11 +136,11 @@ Build ----- Using the Dockerfile defined in tools/kubeadm-aio directory, build the -'openstackhelm/kubeadm-aio:v1.6.7' image. +'openstackhelm/kubeadm-aio:v1.6.8' image. :: - export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7 + export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.8 sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio Deploy @@ -155,7 +155,7 @@ displayed during execution. :: - export KUBE_VERSION=v1.6.7 + export KUBE_VERSION=v1.6.8 ./tools/kubeadm-aio/kubeadm-aio-launcher.sh export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf mkdir -p ${HOME}/.kube diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index 417666b6fe..fc656d8166 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -29,7 +29,7 @@ comments, please create an `issue - Version - Notes * - **Kubernetes** - - `v1.6.7 `_ + - `v1.6.8 `_ - `Custom Controller for RDB tools `_ * - **Helm** - `v2.5.1 `_ @@ -85,8 +85,8 @@ on every node in your cluster before executing ``kubeadm init``: :: - export CEPH_KUBE_CONTROLLER_MANAGER_IMAGE=quay.io/attcomdev/kube-controller-manager:v1.6.7 - export BASE_KUBE_CONTROLLER_MANAGER_IMAGE=gcr.io/google_containers/kube-controller-manager-amd64:v1.6.7 + export CEPH_KUBE_CONTROLLER_MANAGER_IMAGE=quay.io/attcomdev/kube-controller-manager:v1.6.8 + export BASE_KUBE_CONTROLLER_MANAGER_IMAGE=gcr.io/google_containers/kube-controller-manager-amd64:v1.6.8 sudo docker pull ${CEPH_KUBE_CONTROLLER_MANAGER_IMAGE} sudo docker tag ${CEPH_KUBE_CONTROLLER_MANAGER_IMAGE} ${BASE_KUBE_CONTROLLER_MANAGER_IMAGE} @@ -94,7 +94,7 @@ Afterwards, you can ``kubeadm init`` as such: :: - admin@kubenode01:~$ kubeadm init --kubernetes-version v1.6.7 + admin@kubenode01:~$ kubeadm init --kubernetes-version v1.6.8 If your environment looks like this after all nodes have joined the diff --git a/tools/gate/dump_logs.sh b/tools/gate/dump_logs.sh index 15168c33ab..4c1ce3cbf8 100755 --- a/tools/gate/dump_logs.sh +++ b/tools/gate/dump_logs.sh @@ -84,6 +84,7 @@ NODE_NAME=$(hostname) mkdir -p ${LOGS_DIR}/nodes/${NODE_NAME} echo "${NODE_NAME}" > ${LOGS_DIR}/nodes/master.txt sudo docker logs kubelet 2> ${LOGS_DIR}/nodes/${NODE_NAME}/kubelet.txt +sudo docker logs kubeadm-aio 2>&1 > ${LOGS_DIR}/nodes/${NODE_NAME}/kubeadm-aio.txt sudo docker images --digests --no-trunc --all > ${LOGS_DIR}/nodes/${NODE_NAME}/images.txt sudo iptables-save > ${LOGS_DIR}/nodes/${NODE_NAME}/iptables.txt sudo ip a > ${LOGS_DIR}/nodes/${NODE_NAME}/ip.txt @@ -99,6 +100,7 @@ if [ "x$INTEGRATION" == "xmulti" ]; then NODE_NAME=$(ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} hostname) mkdir -p ${LOGS_DIR}/nodes/${NODE_NAME} ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} sudo docker logs kubelet 2> ${LOGS_DIR}/nodes/${NODE_NAME}/kubelet.txt + ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} sudo docker logs kubeadm-aio 2>&1 > ${LOGS_DIR}/nodes/${NODE_NAME}/kubeadm-aio.txt ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} sudo docker images --digests --no-trunc --all > ${LOGS_DIR}/nodes/${NODE_NAME}/images.txt ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} sudo iptables-save > ${LOGS_DIR}/nodes/${NODE_NAME}/iptables.txt ssh -i ${SSH_PRIVATE_KEY} $(whoami)@${NODE_IP} sudo ip a > ${LOGS_DIR}/nodes/${NODE_NAME}/ip.txt diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh index 1f014fec8e..1594c17471 100755 --- a/tools/gate/setup_gate.sh +++ b/tools/gate/setup_gate.sh @@ -14,7 +14,7 @@ set -ex export HELM_VERSION=${HELM_VERSION:-"v2.5.1"} -export KUBE_VERSION=${KUBE_VERSION:-"v1.6.7"} +export KUBE_VERSION=${KUBE_VERSION:-"v1.6.8"} export PVC_BACKEND=${PVC_BACKEND:-"ceph"} export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8"} export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile index 42f50df2dc..00ddbf3804 100644 --- a/tools/images/ceph-config-helper/Dockerfile +++ b/tools/images/ceph-config-helper/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:16.04 MAINTAINER pete.birley@att.com -ARG KUBE_VERSION=v1.6.7 +ARG KUBE_VERSION=v1.6.8 RUN set -x \ && TMP_DIR=$(mktemp --directory) \ diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst index c88897239f..ec37ed86a9 100644 --- a/tools/images/ceph-config-helper/README.rst +++ b/tools/images/ceph-config-helper/README.rst @@ -31,7 +31,7 @@ repo run: .. code:: bash - export KUBE_VERSION=v1.6.7 + export KUBE_VERSION=v1.6.8 sudo docker build \ --build-arg KUBE_VERSION=${KUBE_VERSION} \ -t docker.io/port/ceph-config-helper:${KUBE_VERSION} \ diff --git a/tools/kubeadm-aio/Dockerfile b/tools/kubeadm-aio/Dockerfile index c82f9424a2..dfc57bb2f2 100644 --- a/tools/kubeadm-aio/Dockerfile +++ b/tools/kubeadm-aio/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 MAINTAINER pete.birley@att.com ENV HELM_VERSION=v2.5.1 \ - KUBE_VERSION=v1.6.7 \ + KUBE_VERSION=v1.6.8 \ 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 fb30b24734..c7f7f9b1d5 100644 --- a/tools/kubeadm-aio/README.rst +++ b/tools/kubeadm-aio/README.rst @@ -31,7 +31,7 @@ You should install the ``kubectl`` and ``helm`` binaries: .. code:: bash - KUBE_VERSION=v1.6.7 + KUBE_VERSION=v1.6.8 HELM_VERSION=v2.5.1 TMP_DIR=$(mktemp -d) @@ -57,7 +57,7 @@ repo run: .. code:: bash - export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7 + export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.8 sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio Deploy the AIO environment @@ -67,8 +67,8 @@ To launch the environment run: .. code:: bash - export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7 - export KUBE_VERSION=v1.6.7 + export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.8 + export KUBE_VERSION=v1.6.8 ./tools/kubeadm-aio/kubeadm-aio-launcher.sh export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf