Merge pull request kubernetes#25656 from tmrts/godep-update/rkt-1.6.0

Automatic merge from submit-queue Update rkt API version to 1.6.0 Updates coreos/rkt container runtime dependency to `1.6.0` Fixes kubernetes#25430
332054781 · May 21, 2016 · d6d0a6e · d6d0a6e
2 parents d06fe0c + 7d40332
commit d6d0a6e
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 111 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go
@@ -64,9 +64,9 @@ const (
 	RktType                      = "rkt"
 	DefaultRktAPIServiceEndpoint = "localhost:15441"
 
-	minimumAppcVersion       = "0.7.4"
-	minimumRktBinVersion     = "1.2.1"
-	recommendedRktBinVersion = "1.2.1"
+	minimumAppcVersion       = "0.8.1"
+	minimumRktBinVersion     = "1.6.0"
+	recommendedRktBinVersion = "1.6.0"
 	minimumRktApiVersion     = "1.0.0-alpha"
 	minimumSystemdVersion    = "219"
 

diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go