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

Godeps/Godeps.json

@@ -52,18 +52,18 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.7.4-43-gd22f52b",
-			"Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.7.4-43-gd22f52b",
-			"Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.7.4-43-gd22f52b",
-			"Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/armon/go-metrics",
@@ -545,8 +545,8 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/rkt/api/v1alpha",
-			"Comment": "v1.4.0",
-			"Rev": "f5b69782d120a7ae5ada8f2ebad97a014a98ebd5"
+			"Comment": "v1.6.0",
+			"Rev": "14437382a98e5ebeb6cafb57cff445370e3f7d56"
 		},
 		{
 			"ImportPath": "github.com/cpuguy83/go-md2man/md2man",

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"
 

vendor/github.com/appc/spec/schema/pod.go

@@ -152,11 +152,12 @@ func (r Mount) assertValid() error {
 
 // RuntimeApp describes an application referenced in a PodManifest
 type RuntimeApp struct {
-	Name        types.ACName      `json:"name"`
-	Image       RuntimeImage      `json:"image"`
-	App         *types.App        `json:"app,omitempty"`
-	Mounts      []Mount           `json:"mounts,omitempty"`
-	Annotations types.Annotations `json:"annotations,omitempty"`
+	Name           types.ACName      `json:"name"`
+	Image          RuntimeImage      `json:"image"`
+	App            *types.App        `json:"app,omitempty"`
+	ReadOnlyRootFS bool              `json:"readOnlyRootFS,omitempty"`
+	Mounts         []Mount           `json:"mounts,omitempty"`
+	Annotations    types.Annotations `json:"annotations,omitempty"`
 }
 
 // RuntimeImage describes an image referenced in a RuntimeApp

vendor/github.com/appc/spec/schema/version.go

@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.7.4+git"
+	version string = "0.8.1"
 )
 
 var (

vendor/github.com/coreos/rkt/api/v1alpha/api.proto

@@ -217,6 +217,10 @@ message PodFilter {
 
         // If not empty, the pods whose cgroup are listed will be returned.
         repeated string cgroups = 7;
+
+        // If not empty, the pods whose these cgroup belong to will be returned.
+        // i.e. the pod's cgroup is a prefix of the specified cgroup
+        repeated string pod_sub_cgroups = 8;
 }
 
 // ImageFilter defines the condition that the returned images need to satisfy in ListImages().