dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 17:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to v0.36.x kubernetes dependencies

Browse Source 
Signed-off-by: Jordan Liggitt <liggitt@google.com>
This commit is contained in:
Jordan Liggitt
2026-05-20 15:23:07 -04:00
parent 4c9842f35e
commit 78abbfb7f7
6 changed files with 88 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go.mod
View File

@@ -82,13 +82,13 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa
google.golang.org/grpc v1.82.0
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
k8s.io/apimachinery v0.36.1
k8s.io/client-go v0.36.1
k8s.io/cri-api v0.36.1
k8s.io/cri-client v0.36.1
k8s.io/cri-streaming v0.36.1
k8s.io/apimachinery v0.36.3
k8s.io/client-go v0.36.3
k8s.io/cri-api v0.36.3
k8s.io/cri-client v0.36.3
k8s.io/cri-streaming v0.36.3
k8s.io/klog/v2 v2.140.0
k8s.io/streaming v0.36.1
k8s.io/streaming v0.36.3
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
tags.cncf.io/container-device-interface v1.1.0
)
@@ -153,12 +153,12 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.36.1 // indirect
k8s.io/component-base v0.36.1 // indirect
k8s.io/api v0.36.3 // indirect
k8s.io/component-base v0.36.3 // indirect
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.3 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
)

36
go.sum
View File

@@ -543,34 +543,34 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY=
k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo=
k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA=
k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8=
k8s.io/client-go v0.36.1 h1:FN/K8QIT2CEDt+2WB2HnWrUANZ50AP5GII43/SP2JR0=
k8s.io/client-go v0.36.1/go.mod h1:s6rAnCtTGYDQnpNjEhSaISV+2O8jwruZ6m3QOYBFbtU=
k8s.io/component-base v0.36.1 h1:iG6GsELftXqTNG9HG6kiVjatSgAw1sf5pJ6R5a6N0kA=
k8s.io/component-base v0.36.1/go.mod h1:nf9XPlntRdqO6WMeEWAA5F93Y4ICZQdeT9GeqLDB3JI=
k8s.io/cri-api v0.36.1 h1:g4vRySdoN5G+FMXC1jfGdUyynsHy2qaHZKZhCXZuEmg=
k8s.io/cri-api v0.36.1/go.mod h1:1gMX7udEAiRCWGS4uxscdbxq6vufwhZt38Ri+XH6P00=
k8s.io/cri-client v0.36.1 h1:Yp5Aquk7gZyBrzUFI2n/S1K3DxRzO0rLmdKwtleHpCQ=
k8s.io/cri-client v0.36.1/go.mod h1:5fF14GCsamGYClcmYFy7YCXc+N88VLuQt10RigK0h6M=
k8s.io/cri-streaming v0.36.1 h1:jF/d6O8GTLkXzUQLmmlimSDuFdwZ/QzwjxtsNSc3u7Y=
k8s.io/cri-streaming v0.36.1/go.mod h1:cYcmHwVBUgTp1xsE/zuXzzNvrFxe5mBnXiEkPEgP0yo=
k8s.io/api v0.36.3 h1:NxB+05W2UGqXWFXcLO0RB5cnqnUPP5v5sVlaOH0Iz4w=
k8s.io/api v0.36.3/go.mod h1:JzLQKqRHC5+I8RVj/lS3lCg0mg6nWI9Fo/Sk3ElxHzg=
k8s.io/apimachinery v0.36.3 h1:PkzMRBRG8joFD8EhCuQAtNPvJlxb82FwplP26HIzvAM=
k8s.io/apimachinery v0.36.3/go.mod h1:cTSjBWgPe/6CQyBKzY/hDIRWCQQQeK0mfLbml0UYFHE=
k8s.io/client-go v0.36.3 h1:M4JdVzXxYcZk4fGpfDdYnxSwhLKWCFoQsHW6t+z8Hfg=
k8s.io/client-go v0.36.3/go.mod h1:gcPwr0c87vjjG6HB6pWEqOeuYVoXSsREjzux2j6GF30=
k8s.io/component-base v0.36.3 h1:vc/UFvPCkW0irPz84LAodAL1j3f4xktPM6dDJIEheAY=
k8s.io/component-base v0.36.3/go.mod h1:hZbNFG+gCMl9EbykDGEu73feKP9/Cq6JsV4pTo9GTO8=
k8s.io/cri-api v0.36.3 h1:QFEMKGim6DSdlaW3JwpjVCjUQgTnkKG7i3McAaBW6Fo=
k8s.io/cri-api v0.36.3/go.mod h1:1gMX7udEAiRCWGS4uxscdbxq6vufwhZt38Ri+XH6P00=
k8s.io/cri-client v0.36.3 h1:WJDkJi43siWEUPyChC4ag9xUannsyW/TfL4OgLUsYOA=
k8s.io/cri-client v0.36.3/go.mod h1:kQd5eyZf1fGedMYirzWXG+miafXvaQHwRjYvWTjHcKc=
k8s.io/cri-streaming v0.36.3 h1:9K5Is7E9rwhwrOOiRWoWNX2xQ/5haD6G6DMl6pvfn9M=
k8s.io/cri-streaming v0.36.3/go.mod h1:qNVk/oZbSFiV9Ml/F5wdE16sE4lp+Mk4JJxlB8NbitI=
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 h1:Sztf7ESG9tAXRW/ACJZjrj5jhdOUqS2KFRQT+CTvu78=
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
k8s.io/streaming v0.36.1 h1:L+K68n4Gg940BGNNYtUBvL1WTLL0YnKT3s+P1MNAmR4=
k8s.io/streaming v0.36.1/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
k8s.io/streaming v0.36.3 h1:9rAaqBk0C0Pc7+/fqGekj07NV+/Xrew58p647A0JT8w=
k8s.io/streaming v0.36.3/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/structured-merge-diff/v6 v6.3.3 h1:u08YRbVUi59ri4YD6cg0UqNM4Dimn0sIl+wldcx5PYw=
sigs.k8s.io/structured-merge-diff/v6 v6.3.3/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
tags.cncf.io/container-device-interface v1.1.0 h1:RnxNhxF1JOu6CJUVpetTYvrXHdxw9j9jFYgZpI+anSY=

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

@@ -4268,7 +4268,7 @@ func (x *ImageSpec) GetImageRef() string {
type KeyValue struct {
state protoimpl.MessageState `protogen:"open.v1"`
Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -4310,11 +4310,11 @@ func (x *KeyValue) GetKey() string {
return ""
}
func (x *KeyValue) GetValue() string {
func (x *KeyValue) GetValue() []byte {
if x != nil {
return x.Value
}
return ""
return nil
}
// LinuxContainerResources specifies Linux specific configuration for
@@ -12157,7 +12157,7 @@ var file_staging_src_k8s_io_cri_api_pkg_apis_runtime_v1_api_proto_rawDesc = stri
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x08, 0x4b,
0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22,
0x95, 0x04, 0x0a, 0x17, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
0x65, 0x72, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x63,
0x70, 0x75, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,

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

@@ -951,7 +951,7 @@ message ImageSpec {
message KeyValue {
string key = 1;
string value = 2;
bytes value = 2;
}
// LinuxContainerResources specifies Linux specific configuration for

47
vendor/k8s.io/cri-api/pkg/apis/runtime/v1/api_json.go generated vendored Normal file
View File

@@ -0,0 +1,47 @@
/*
Copyright The Kubernetes 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 v1
import "encoding/json"
// MarshalJSON() preserves pre-1.34 JSON encoding of value as a string (not base64),
// stomping non-utf-8 data with the utf8 replacement character.
func (k *KeyValue) MarshalJSON() ([]byte, error) {
return json.Marshal(stringKeyValue{
Key: k.GetKey(),
Value: string(k.GetValue()),
})
}
// UnmarshalJSON preserves pre-1.34 JSON decoding of value as a string (not base64),
// stomping non-utf-8 data with the utf8 replacement character.
func (k *KeyValue) UnmarshalJSON(data []byte) error {
v := stringKeyValue{}
if err := json.Unmarshal(data, &v); err != nil {
return err
}
k.Key = v.Key
k.Value = []byte(v.Value)
return nil
}
// stringKeyValue matches the structure used to json-encode pre-1.34.
// Non-UTF-8 characters in Value are coerced to the replacement character on encode/decode.
type stringKeyValue struct {
Key string `json:"key,omitempty"`
Value string `json:"value,omitempty"`
}

18
vendor/modules.txt vendored
View File

@@ -868,10 +868,10 @@ gopkg.in/inf.v0
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.36.1
# k8s.io/api v0.36.3
## explicit; go 1.26.0
k8s.io/api/core/v1
# k8s.io/apimachinery v0.36.1
# k8s.io/apimachinery v0.36.3
## explicit; go 1.26.0
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
@@ -917,7 +917,7 @@ k8s.io/apimachinery/pkg/util/yaml
k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v0.36.1
# k8s.io/client-go v0.36.3
## explicit; go 1.26.0
k8s.io/client-go/features
k8s.io/client-go/pkg/apis/clientauthentication
@@ -940,19 +940,19 @@ k8s.io/client-go/util/exec
k8s.io/client-go/util/flowcontrol
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/workqueue
# k8s.io/component-base v0.36.1
# k8s.io/component-base v0.36.3
## explicit; go 1.26.0
k8s.io/component-base/logs/logreduction
# k8s.io/cri-api v0.36.1
# k8s.io/cri-api v0.36.3
## explicit; go 1.26.0
k8s.io/cri-api/pkg/apis
k8s.io/cri-api/pkg/apis/runtime/v1
k8s.io/cri-api/pkg/errors
# k8s.io/cri-client v0.36.1
# k8s.io/cri-client v0.36.3
## explicit; go 1.26.0
k8s.io/cri-client/pkg
k8s.io/cri-client/pkg/util
# k8s.io/cri-streaming v0.36.1
# k8s.io/cri-streaming v0.36.3
## explicit; go 1.26.0
k8s.io/cri-streaming/pkg/streaming
k8s.io/cri-streaming/pkg/streaming/internal/httpresponse
@@ -972,7 +972,7 @@ k8s.io/klog/v2/textlogger
# k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9
## explicit; go 1.23.0
k8s.io/kube-openapi/pkg/util
# k8s.io/streaming v0.36.1
# k8s.io/streaming v0.36.3
## explicit; go 1.26.0
k8s.io/streaming/pkg/httpstream
k8s.io/streaming/pkg/httpstream/spdy
@@ -995,7 +995,7 @@ sigs.k8s.io/json/internal/golang/encoding/json
## explicit; go 1.18
sigs.k8s.io/randfill
sigs.k8s.io/randfill/bytesource
# sigs.k8s.io/structured-merge-diff/v6 v6.3.2
# sigs.k8s.io/structured-merge-diff/v6 v6.3.3
## explicit; go 1.23
sigs.k8s.io/structured-merge-diff/v6/value
# sigs.k8s.io/yaml v1.6.0