devstack: Add compatibility for newer k8s

This supports:
- 1.9.10
- 1.10.8
- 1.11.3
- 1.12.0

Change-Id: I59ed642db00faf358d9217df2db7d389a649eacb
Signed-off-by: Antoni Segura Puimedon <celebdor@gmail.com>
This commit is contained in:
Antoni Segura Puimedon 2018-09-28 13:50:41 +02:00
parent 79ec91f681
commit d968c43119
3 changed files with 22 additions and 14 deletions

View File

@ -685,7 +685,7 @@ function run_k8s_kubelet {
sudo mkdir -p "${KURYR_HYPERKUBE_DATA_DIR}/"{kubelet,kubelet.cert}
command="$KURYR_HYPERKUBE_BINARY kubelet\
--kubeconfig=${HOME}/.kube/config --require-kubeconfig \
--kubeconfig=${HOME}/.kube/config \
--allow-privileged=true \
--v=2 \
--cgroup-driver=$cgroup_driver \
@ -697,9 +697,15 @@ function run_k8s_kubelet {
--cert-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet.cert \
--root-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet"
declare -r min_not_require_kubeconfig_ver="1.10.0"
if [[ "$KURYR_HYPERKUBE_VERSION" == "$(echo -e "${KURYR_HYPERKUBE_VERSION}\n${min_not_require_kubeconfig_ver}" | sort -V | head -n 1)" ]]; then
# Version 1.10 did away with that config option
command+=" --require-kubeconfig"
fi
# Kubernetes 1.8+ requires additional option to work in the gate.
minor_version=${KURYR_HYPERKUBE_VERSION:3:1}
if [ ${minor_version} -gt 7 ]; then
declare -r min_no_swap_ver="1.8.0"
if [[ "$min_no_swap_ver" == "$(echo -e "${KURYR_HYPERKUBE_VERSION}\n${min_no_swap_ver}" | sort -V | head -n 1)" ]]; then
command="$command --fail-swap-on=false"
fi

View File

@ -34,7 +34,8 @@ KURYR_ETCD_LISTEN_PEER_URL=${KURYR_ETCD_LISTEN_PEER_URL:-http://0.0.0.0:2380}
# HYPERKUBE
KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64}
KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.9.0}
# Tested with 1.8.15, 1.9.10, 1.10.8, 1.11.3 and 1.12.0
KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.12.0}
KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube}
KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube}

View File

@ -6,13 +6,14 @@ This document maintains updated documentation about what Kubernetes and
OpenShift versions are supported at each Kuryr-Kubernetes release.
======================== ================== ========================
Kuryr-Kubernetes version Kubernetes version OpenShift Origin version
======================== ================== ========================
master v1.9.x 3.9
0.4.1 v1.8.x 3.7
0.4.0 v1.8.x 3.7
0.3.0 v1.6.x, 1.8.x No support
0.2.0 v1.4.x, 1.6.x No support
0.1.0 v1.3.x, 1.4.x No support
======================== ================== ========================
======================== ============================== ========================
Kuryr-Kubernetes version Kubernetes version OpenShift Origin version
======================== ============================== ========================
master v1.9.x, 1.10.x, 1.11.x, 1.12.x 3.9, 3.10
0.5.0 v1.9.x, 1.10.x 3.9, 3.10
0.4.1 v1.8.x 3.7
0.4.0 v1.8.x 3.7
0.3.0 v1.6.x, 1.8.x No support
0.2.0 v1.4.x, 1.6.x No support
0.1.0 v1.3.x, 1.4.x No support
======================== ============================== ========================