Bumping k8s dependencies to 1.13

This commit is contained in:
Cheng Xing
2018-11-16 14:08:25 -08:00
parent 305407125c
commit b4c0b68ec7
8002 changed files with 884099 additions and 276228 deletions

View File

@@ -8,42 +8,9 @@ go_library(
"helper.go",
"log_metrics_provider.go",
"stats_provider.go",
] + select({
"@io_bazel_rules_go//go/platform:android": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:darwin": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:dragonfly": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:freebsd": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:linux": [
"stats_provider_linux.go",
],
"@io_bazel_rules_go//go/platform:nacl": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:netbsd": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:openbsd": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:plan9": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:solaris": [
"stats_provider_unsupported.go",
],
"@io_bazel_rules_go//go/platform:windows": [
"stats_provider_unsupported.go",
],
"//conditions:default": [],
}),
"stats_provider_linux.go",
"stats_provider_unsupported.go",
],
importpath = "k8s.io/kubernetes/pkg/kubelet/stats",
visibility = ["//visibility:public"],
deps = [
@@ -59,12 +26,12 @@ go_library(
"//pkg/kubelet/server/stats:go_default_library",
"//pkg/kubelet/types:go_default_library",
"//pkg/volume:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/cadvisor/fs:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
],
)
@@ -106,14 +73,14 @@ go_test(
"//pkg/kubelet/server/stats:go_default_library",
"//pkg/kubelet/types:go_default_library",
"//pkg/volume:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/github.com/google/cadvisor/fs:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/github.com/google/gofuzz:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
],
)

View File

@@ -182,9 +182,11 @@ func (p *criStatsProvider) ImageFsStats() (*statsapi.FsStats, error) {
// TODO(yguo0905): Support returning stats of multiple image filesystems.
for _, fs := range resp {
s := &statsapi.FsStats{
Time: metav1.NewTime(time.Unix(0, fs.Timestamp)),
UsedBytes: &fs.UsedBytes.Value,
InodesUsed: &fs.InodesUsed.Value,
Time: metav1.NewTime(time.Unix(0, fs.Timestamp)),
UsedBytes: &fs.UsedBytes.Value,
}
if fs.InodesUsed != nil {
s.InodesUsed = &fs.InodesUsed.Value
}
imageFsInfo := p.getFsInfo(fs.GetFsId())
if imageFsInfo != nil {