Merge pull request #28044 from yifan-gu/bump_rkt

Automatic merge from submit-queue rkt: Bump required rkt version to 1.9.1. Bump the rkt version to use the one that fixed the [go-systemd sdjournal issue](https://github.com/coreos/rkt/pull/2837), also match [release doc](https://github.com/kubernetes/kubernetes.github.io/blob/release-1.3/docs/getting-started-guides/rkt/index.md#prerequisite). cc @kubernetes/sig-rktnetes @kubernetes/sig-node

Merge pull request #28044 from yifan-gu/bump_rkt
151c2249 · k8s-merge-robot · GitHub · 19650207 · 30c913e2 · 151c2249
Commit 151c2249 authored Jun 24, 2016 by k8s-merge-robot Committed by GitHub Jun 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

config-default.sh cluster/gce/config-default.sh +1 -1

config-test.sh cluster/gce/config-test.sh +1 -1

rkt.go pkg/kubelet/rkt/rkt.go +2 -2

No files found.
--- 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}

--- 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}

--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -67,8 +67,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"