openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "devstack: Update Kubernetes to 1.13.0"

This commit is contained in:
Zuul 2018-12-04 18:36:53 +00:00 committed by Gerrit Code Review
parent 9fe698c2d9 364bfa1bc5
commit 4f71019c94
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/settings
View File

@ -27,8 +27,8 @@ ETCD_PORT=${ETCD_PORT:-2379}
# HYPERKUBE
KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64}
# Tested with 1.8.15, 1.9.10, 1.10.8, 1.11.3 and 1.12.2
KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.12.2}
# Tested with 1.8.15, 1.9.10, 1.10.8, 1.11.3, 1.12.2 and 1.13.0
KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.13.0}
KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube}
KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube}

23
doc/source/devref/kuryr_kubernetes_versions.rst
View File

@ -6,14 +6,15 @@ 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, 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
======================== ============================== ========================
======================== ====================================== ========================
Kuryr-Kubernetes version Kubernetes version OpenShift Origin version
======================== ====================================== ========================
master v1.9.x, 1.10.x, 1.11.x, 1.12.x, 1.13.x 3.9, 3.10, 3.11
0.5.2 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
======================== ====================================== ========================