github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10019 from AkihiroSuda/cri-api-v0.30.0-rc.0

Browse Source 
go.mod: k8s.io/cri-api v0.30.0
This commit is contained in:
Maksym Pavlenko 2024-04-30 18:27:46 +00:00 committed by GitHub
commit 97dd9d508a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 580 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -76,7 +76,7 @@ require (
k8s.io/apimachinery v0.29.2 k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2 k8s.io/client-go v0.29.2
k8s.io/component-base v0.29.2 k8s.io/component-base v0.29.2
k8s.io/cri-api v0.30.0-alpha.3 k8s.io/cri-api v0.30.0
k8s.io/klog/v2 v2.120.1 k8s.io/klog/v2 v2.120.1
k8s.io/kubelet v0.29.2 k8s.io/kubelet v0.29.2
k8s.io/utils v0.0.0-20230726121419-3b25d923346b k8s.io/utils v0.0.0-20230726121419-3b25d923346b

4
go.sum
View File

@ -767,8 +767,8 @@ k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
k8s.io/cri-api v0.30.0-alpha.3 h1:oDH5Wt3Rkxh4hqfAtFaeOfFSY0z2qnzTbt5QHcVhnsc= k8s.io/cri-api v0.30.0 h1:hZqh3vH5JZdqeAyhD9nPXSbT6GDgrtPJkPiIzhWKVhk=
k8s.io/cri-api v0.30.0-alpha.3/go.mod h1:ccyGaZDcNRI40/m8vcr9gqkOI/iPI+ZSdpViZsNWhDA= k8s.io/cri-api v0.30.0/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=

988
vendor/k8s.io/cri-api/pkg/apis/runtime/v1/api.pb.go generated vendored
View File

File diff suppressed because it is too large Load Diff

24
vendor/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto generated vendored
View File

@ -1202,8 +1202,7 @@ message Container {
ContainerMetadata metadata = 3; ContainerMetadata metadata = 3;
// Spec of the image. // Spec of the image.
ImageSpec image = 4; ImageSpec image = 4;
// Reference to the image in use. For most runtimes, this should be an // Digested reference to the image in use.
// image ID.
string image_ref = 5; string image_ref = 5;
// State of the container. // State of the container.
ContainerState state = 6; ContainerState state = 6;
@ -1216,6 +1215,16 @@ message Container {
// MUST be identical to that of the corresponding ContainerConfig used to // MUST be identical to that of the corresponding ContainerConfig used to
// instantiate this Container. // instantiate this Container.
map<string, string> annotations = 9; map<string, string> annotations = 9;
// Reference to the unique identifier of the image, on the node, as
// returned in the image service apis.
//
// Note: The image_ref above has been historically used by container
// runtimes to reference images by digest. The image_ref has been also used
// in the kubelet image garbage collection, which does not work with
// digests at all. To separate and avoid possible misusage, we now
// introduce the image_id field, which should always refer to a unique
// image identifier on the node.
string image_id = 10;
} }
message ListContainersResponse { message ListContainersResponse {
@ -1248,8 +1257,7 @@ message ContainerStatus {
int32 exit_code = 7; int32 exit_code = 7;
// Spec of the image. // Spec of the image.
ImageSpec image = 8; ImageSpec image = 8;
// Reference to the image in use. For most runtimes, this should be an // Digested reference to the image in use.
// image ID
string image_ref = 9; string image_ref = 9;
// Brief CamelCase string explaining why container is in its current state. // Brief CamelCase string explaining why container is in its current state.
// Must be set to "OOMKilled" for containers terminated by cgroup-based Out-of-Memory killer. // Must be set to "OOMKilled" for containers terminated by cgroup-based Out-of-Memory killer.
@ -1270,6 +1278,14 @@ message ContainerStatus {
string log_path = 15; string log_path = 15;
// Resource limits configuration of the container. // Resource limits configuration of the container.
ContainerResources resources = 16; ContainerResources resources = 16;
// Reference to the unique identifier of the image, on the node, as
// returned in the image service apis.
//
// Note: The image_ref above has been historically used by container
// runtimes to reference images by digest. To separate and avoid possible
// misusage, we now introduce the image_id field, which should always refer
// to a unique image identifier on the node.
string image_id = 17;
} }
message ContainerStatusResponse { message ContainerStatusResponse {

4
vendor/modules.txt vendored
View File

@ -736,8 +736,8 @@ k8s.io/client-go/util/workqueue
# k8s.io/component-base v0.29.2 # k8s.io/component-base v0.29.2
## explicit; go 1.21 ## explicit; go 1.21
k8s.io/component-base/logs/logreduction k8s.io/component-base/logs/logreduction
# k8s.io/cri-api v0.30.0-alpha.3 # k8s.io/cri-api v0.30.0
## explicit; go 1.21 ## explicit; go 1.22.0
k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/apis/runtime/v1
k8s.io/cri-api/pkg/errors k8s.io/cri-api/pkg/errors
# k8s.io/klog/v2 v2.120.1 # k8s.io/klog/v2 v2.120.1