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

Bump k8s.io deps to v0.25.4

Browse Source 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
This commit is contained in:
Luca Comellini
2022-11-11 15:13:35 -08:00
parent 135af6d9ab
commit 38ad785cef
6 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go generated vendored
View File

@@ -27,9 +27,12 @@ func (m *MicroTime) ProtoMicroTime() *Timestamp {
if m == nil {
return &Timestamp{}
}
// truncate precision to microseconds to match JSON marshaling/unmarshaling
truncatedNanoseconds := time.Duration(m.Time.Nanosecond()).Truncate(time.Microsecond)
return &Timestamp{
Seconds: m.Time.Unix(),
Nanos: int32(m.Time.Nanosecond()),
Nanos: int32(truncatedNanoseconds),
}
}
@@ -51,7 +54,10 @@ func (m *MicroTime) Unmarshal(data []byte) error {
if err := p.Unmarshal(data); err != nil {
return err
}
m.Time = time.Unix(p.Seconds, int64(p.Nanos)).Local()
// truncate precision to microseconds to match JSON marshaling/unmarshaling
truncatedNanoseconds := time.Duration(p.Nanos).Truncate(time.Microsecond)
m.Time = time.Unix(p.Seconds, int64(truncatedNanoseconds)).Local()
return nil
}

2
vendor/k8s.io/utils/net/port.go generated vendored
View File

@@ -29,7 +29,7 @@ type IPFamily string
// Constants for valid IPFamilys:
const (
IPv4 IPFamily = "4"
IPv6 = "6"
IPv6 IPFamily = "6"
)
// Protocol is a network protocol support by LocalPort.

14
vendor/modules.txt vendored
View File

@@ -676,11 +676,11 @@ gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.25.3
# k8s.io/api v0.25.4
## explicit; go 1.19
k8s.io/api/authentication/v1
k8s.io/api/core/v1
# k8s.io/apimachinery v0.25.3
# k8s.io/apimachinery v0.25.4
## explicit; go 1.19
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
@@ -725,7 +725,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/netutil
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/apiserver v0.25.3
# k8s.io/apiserver v0.25.4
## explicit; go 1.19
k8s.io/apiserver/pkg/apis/audit
k8s.io/apiserver/pkg/apis/audit/v1
@@ -739,7 +739,7 @@ k8s.io/apiserver/pkg/features
k8s.io/apiserver/pkg/server/httplog
k8s.io/apiserver/pkg/util/feature
k8s.io/apiserver/pkg/util/wsstream
# k8s.io/client-go v0.25.3
# k8s.io/client-go v0.25.4
## explicit; go 1.19
k8s.io/client-go/pkg/apis/clientauthentication
k8s.io/client-go/pkg/apis/clientauthentication/install
@@ -760,7 +760,7 @@ 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.25.3
# k8s.io/component-base v0.25.4
## explicit; go 1.19
k8s.io/component-base/featuregate
k8s.io/component-base/logs/logreduction
@@ -768,7 +768,7 @@ k8s.io/component-base/metrics
k8s.io/component-base/metrics/legacyregistry
k8s.io/component-base/metrics/prometheusextension
k8s.io/component-base/version
# k8s.io/cri-api v0.25.3
# k8s.io/cri-api v0.25.4
## explicit; go 1.19
k8s.io/cri-api/pkg/apis/runtime/v1
k8s.io/cri-api/pkg/apis/runtime/v1alpha2
@@ -780,7 +780,7 @@ k8s.io/klog/v2/internal/clock
k8s.io/klog/v2/internal/dbg
k8s.io/klog/v2/internal/serialize
k8s.io/klog/v2/internal/severity
# k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
# k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
## explicit; go 1.18
k8s.io/utils/clock
k8s.io/utils/clock/testing