From b4bc44b9ff90b118bc7e7da76647d0921ac08332 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 23 Jan 2017 15:22:33 +0000 Subject: [PATCH] cluster: update default rkt version to 1.23.0 --- cluster/aws/config-default.sh | 2 +- cluster/aws/config-test.sh | 2 +- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 0427892c260..23fa3237a2a 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -151,7 +151,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" -RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" +RKT_VERSION="${KUBE_RKT_VERSION:-1.23.0}" NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # kubenet, opencontrail, flannel diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 78ad8d87c2a..27b4d7563e7 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -137,7 +137,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" -RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" +RKT_VERSION="${KUBE_RKT_VERSION:-1.23.0}" NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # kubenet, opencontrail, flannel diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 2c336f20fb5..8144e26cb5e 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -65,7 +65,7 @@ MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} -RKT_VERSION=${KUBE_RKT_VERSION:-1.14.0} +RKT_VERSION=${KUBE_RKT_VERSION:-1.23.0} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos} NETWORK=${KUBE_GCE_NETWORK:-default} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index bb134d1f78d..26678f211b3 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -67,7 +67,7 @@ NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} -RKT_VERSION=${KUBE_RKT_VERSION:-1.14.0} +RKT_VERSION=${KUBE_RKT_VERSION:-1.23.0} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos} NETWORK=${KUBE_GCE_NETWORK:-e2e}