From 30c913e2119b7792f12fded23c58808809b08fbb Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 24 Jun 2016 13:54:32 -0700 Subject: [PATCH] rkt: Bump required rkt version to 1.9.1. --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- pkg/kubelet/rkt/rkt.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 3fb64fca9d6..31e5d0d18e2 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -46,7 +46,7 @@ MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} -RKT_VERSION=${KUBE_RKT_VERSION:-1.8.0} +RKT_VERSION=${KUBE_RKT_VERSION:-1.9.1} 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 1c6181a9b61..c0e31fb0054 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -48,7 +48,7 @@ NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} -RKT_VERSION=${KUBE_RKT_VERSION:-1.8.0} +RKT_VERSION=${KUBE_RKT_VERSION:-1.9.1} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos} NETWORK=${KUBE_GCE_NETWORK:-e2e} diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index da140d63312..262d9c7afd0 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -68,8 +68,8 @@ const ( RktType = "rkt" DefaultRktAPIServiceEndpoint = "localhost:15441" - minimumRktBinVersion = "1.8.0" - recommendedRktBinVersion = "1.8.0" + minimumRktBinVersion = "1.9.1" + recommendedRktBinVersion = "1.9.1" minimumRktApiVersion = "1.0.0-alpha" minimumSystemdVersion = "219"