openstack/openstack-helm
Code Issues Proposed changes

Kubernetes: bump version to K8s v1.6.7

Browse Source 
This PS moves the K8s Version to 1.6.7.

Change-Id: I5a2b871119429ac90a5a284ecc79ebca00dea1ff
This commit is contained in:
Pete Birley 2017-07-09 11:13:08 -05:00
parent ab52a43425
commit 7421dcb36f
11 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/values.yaml
View File

@ -29,7 +29,7 @@ service:
images:
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.5
ceph_config_helper: docker.io/port/ceph-config-helper:v1.6.7
pull_policy: Always
labels:

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

@ -69,7 +69,7 @@ against your Kubernetes cluster.
::
export KUBE_VERSION=v1.6.5
export KUBE_VERSION=v1.6.7
export HELM_VERSION=v2.5.0
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.5' image.
'openstackhelm/kubeadm-aio:v1.6.7' image.
::
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.5
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7
sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio
Deploy
@ -155,7 +155,7 @@ displayed during execution.
::
export KUBE_VERSION=v1.6.5
export KUBE_VERSION=v1.6.7
./tools/kubeadm-aio/kubeadm-aio-launcher.sh
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
mkdir -p ${HOME}/.kube

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

@ -29,7 +29,7 @@ comments, please create an `issue
- Version
- Notes
* - **Kubernetes**
- `v1.6.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v165>`_
- `v1.6.7 <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.5.0 <https://github.com/kubernetes/helm/releases/tag/v2.5.0>`_
@ -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.5
export BASE_KUBE_CONTROLLER_MANAGER_IMAGE=gcr.io/google_containers/kube-controller-manager-amd64:v1.6.5
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
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.5
admin@kubenode01:~$ kubeadm init --kubernetes-version v1.6.7
If your environment looks like this after all nodes have joined the

4
tools/gate/basic_launch.sh
View File

@ -46,7 +46,7 @@ EOF"
--set network.public=$osd_public_network \
--set network.cluster=$osd_cluster_network
kube_wait_for_pods ceph 420
kube_wait_for_pods ceph 600
kubectl exec -n ceph ceph-mon-0 -- ceph -s
@ -69,7 +69,7 @@ helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb
helm install --namespace=openstack ${WORK_DIR}/memcached --name=memcached
helm install --namespace=openstack ${WORK_DIR}/etcd --name=etcd-rabbitmq
helm install --namespace=openstack ${WORK_DIR}/rabbitmq --name=rabbitmq
kube_wait_for_pods openstack 420
kube_wait_for_pods openstack 600
helm install --namespace=openstack ${WORK_DIR}/keystone --name=keystone
if [ "x$PVC_BACKEND" == "xceph" ]; then
helm install --namespace=openstack ${WORK_DIR}/glance --name=glance

1
tools/gate/dump_logs.sh
View File

@ -82,6 +82,7 @@ for NAMESPACE in $(kubectl get namespaces -o name | awk -F '/' '{ print $NF }')
done
mkdir -p ${LOGS_DIR}/nodes/$(hostname)
sudo docker logs kubelet 2> ${LOGS_DIR}/nodes/$(hostname)/kubelet.txt
sudo iptables-save > ${LOGS_DIR}/nodes/$(hostname)/iptables.txt
sudo ip a > ${LOGS_DIR}/nodes/$(hostname)/ip.txt
sudo route -n > ${LOGS_DIR}/nodes/$(hostname)/routes.txt

4
tools/gate/setup_gate.sh
View File

@ -14,9 +14,9 @@
set -ex
export HELM_VERSION=${2:-v2.5.0}
export KUBE_VERSION=${3:-v1.6.5}
export KUBE_VERSION=${3:-v1.6.7}
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:${KUBE_VERSION}-ceph
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:${KUBE_VERSION}
export BASE_KUBE_CONTROLLER_MANAGER_IMAGE=gcr.io/google_containers/kube-controller-manager-amd64:${KUBE_VERSION}
export CEPH_KUBE_CONTROLLER_MANAGER_IMAGE=quay.io/attcomdev/kube-controller-manager:${KUBE_VERSION}

2
tools/images/ceph-config-helper/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04
MAINTAINER pete.birley@att.com
ARG KUBE_VERSION=v1.6.5
ARG KUBE_VERSION=v1.6.7
RUN set -x \
&& TMP_DIR=$(mktemp --directory) \

2
tools/images/ceph-config-helper/README.rst
View File

@ -31,7 +31,7 @@ repo run:
.. code:: bash
export KUBE_VERSION=v1.6.5
export KUBE_VERSION=v1.6.7
sudo docker build \
--build-arg KUBE_VERSION=${KUBE_VERSION} \
-t docker.io/port/ceph-config-helper:${KUBE_VERSION} \

10
tools/kubeadm-aio/Dockerfile
View File

@ -2,7 +2,7 @@ FROM ubuntu:16.04
MAINTAINER pete.birley@att.com
ENV HELM_VERSION=v2.5.0 \
KUBE_VERSION=v1.6.5 \
KUBE_VERSION=v1.6.7 \
CNI_VERSION=v0.5.2 \
container="docker" \
DEBIAN_FRONTEND="noninteractive"
@ -11,15 +11,16 @@ RUN set -x \
&& TMP_DIR=$(mktemp --directory) \
&& cd ${TMP_DIR} \
&& apt-get update \
&& apt-get install -y \
&& apt-get install -y --no-install-recommends \
apt-transport-https \
ca-certificates \
curl \
dbus \
# Add Kubernetes repo
&& curl -sSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
&& echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list \
&& apt-get update \
&& apt-get install -y \
&& apt-get install -y --no-install-recommends \
docker.io \
iptables \
kubectl \
@ -56,7 +57,7 @@ RUN set -x \
&& curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 \
&& mv ${TMP_DIR}/helm /usr/bin/helm \
# Install openstack-helm dev utils
&& apt-get install -y \
&& apt-get install -y --no-install-recommends \
make \
git \
vim \
@ -64,6 +65,7 @@ RUN set -x \
# Install utils for PVC provisioners
nfs-common \
ceph-common \
kmod \
# Tweak Systemd units and targets for running in a container
&& find /lib/systemd/system/sysinit.target.wants/ ! -name 'systemd-tmpfiles-setup.service' -type l -exec rm -fv {} + \
&& rm -fv \

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

@ -31,7 +31,7 @@ You should install the ``kubectl`` and ``helm`` binaries:
.. code:: bash
KUBE_VERSION=v1.6.5
KUBE_VERSION=v1.6.7
HELM_VERSION=v2.5.0
TMP_DIR=$(mktemp -d)
@ -57,7 +57,7 @@ repo run:
.. code:: bash
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.5
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7
sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio
Deploy the AIO environment
@ -67,8 +67,8 @@ To launch the environment then run:
.. code:: bash
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.5
export KUBE_VERSION=v1.6.5
export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6.7
export KUBE_VERSION=v1.6.7
./tools/kubeadm-aio/kubeadm-aio-launcher.sh
export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf

2
tools/kubeadm-aio/kubeadm-aio-launcher.sh
View File

@ -57,7 +57,7 @@ sudo docker run \
echo "Waiting for kubeconfig"
set +x
end=$(($(date +%s) + 120))
end=$(($(date +%s) + 240))
READY="False"
while true; do
if [ -f ${HOME}/.kubeadm-aio/admin.conf ]; then