Merge pull request containerd#6703 from mxpv/s

Sandbox API
aznashwan · Apr 19, 2022 · be60973 · be60973
2 parents 7cbde74 + b446c76
commit be60973
Show file tree

Hide file tree

Showing 45 changed files with 12,334 additions and 75 deletions.
diff --git a/api/next.pb.txt b/api/next.pb.txt
diff --git a/api/services/containers/v1/containers.pb.go b/api/services/containers/v1/containers.pb.go
diff --git a/api/services/containers/v1/containers.proto b/api/services/containers/v1/containers.proto
@@ -114,6 +114,9 @@ message Container {
 	// data, one should only update the specified extension using field paths
 	// to select a specific map key.
 	map<string, google.protobuf.Any> extensions = 10 [(gogoproto.nullable) = false];
+
+	// Sandbox ID this container belongs to.
+	string sandbox = 11;
 }
 
 message GetContainerRequest {

diff --git a/api/services/sandbox/v1/doc.go b/api/services/sandbox/v1/doc.go
@@ -0,0 +1,17 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package sandbox